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

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widgetx@94588 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-04-08 17:31:30 +00:00 committed by Giancarlo Panichi
parent 8f62d59e59
commit b5369157f3
3 changed files with 25 additions and 18 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"?>
<classpath>
<classpathentry kind="src" output="target/tabular-data-widgetx-1.0.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/tabular-data-widgetx-1.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/tabular-data-widgetx-1.0.2-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/tabular-data-widgetx-1.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -28,5 +28,5 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/tabular-data-widgetx-1.0.2-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/tabular-data-widgetx-1.1.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

7
src/main/java/org/gcube/portlets/user/tdwx/client/model/util/ColumnConfigGenerator.java
View File

@ -101,9 +101,14 @@ public class ColumnConfigGenerator {
columnConfig.setHidden(!columnDefinition.isVisible());
SafeHtmlBuilder tooltipMessage = new SafeHtmlBuilder();
String local="";
if(columnDefinition.getLocale()!=null && !columnDefinition.getLocale().isEmpty()){
local=" ["+columnDefinition.getLocale()+"] ";
}
tooltipMessage
.appendHtmlConstant("<p align='Left'><bold style='font-weight:bold;'>"
+ columnDefinition.getLabel()
+ columnDefinition.getLabel()+local
+ "</bold><BR>"
+ "<em style='text-decoration:underline;'>"
+ columnDefinition.getColumnTypeName()

30
src/main/java/org/gcube/portlets/user/tdwx/shared/model/ColumnDefinition.java
View File

@ -22,8 +22,9 @@ public class ColumnDefinition implements Serializable {
protected String sourceTableDimensionColumnId;
protected String targetTableColumnId;
protected long targetTableId;
protected String label; //Label
protected String locale;
protected ValueType valueType;
protected int width;
protected boolean editable;
@ -252,6 +253,14 @@ public class ColumnDefinition implements Serializable {
this.label = label;
}
public String getLocale() {
return locale;
}
public void setLocale(String locale) {
this.locale = locale;
}
@Override
public String toString() {
return "ColumnDefinition [id=" + id + ", columnLocalId="
@ -259,20 +268,13 @@ public class ColumnDefinition implements Serializable {
+ ", sourceTableDimensionColumnId="
+ sourceTableDimensionColumnId + ", targetTableColumnId="
+ targetTableColumnId + ", targetTableId=" + targetTableId
+ ", label=" + label + ", valueType=" + valueType + ", width="
+ width + ", editable=" + editable + ", visible=" + visible
+ ", type=" + type + ", position=" + position
+ ", tooltipMessage=" + tooltipMessage + ", columnTypeName="
+ columnTypeName + ", columnDataType=" + columnDataType
+ ", key=" + key + "]";
+ ", label=" + label + ", locale=" + locale + ", valueType="
+ valueType + ", width=" + width + ", editable=" + editable
+ ", visible=" + visible + ", type=" + type + ", position="
+ position + ", tooltipMessage=" + tooltipMessage
+ ", columnTypeName=" + columnTypeName + ", columnDataType="
+ columnDataType + ", key=" + key + "]";
}
}