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:
parent
8f62d59e59
commit
b5369157f3
|
@ -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-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>
|
<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-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>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -28,5 +28,5 @@
|
||||||
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
|
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
</classpath>
|
||||||
|
|
|
@ -101,9 +101,14 @@ public class ColumnConfigGenerator {
|
||||||
|
|
||||||
columnConfig.setHidden(!columnDefinition.isVisible());
|
columnConfig.setHidden(!columnDefinition.isVisible());
|
||||||
SafeHtmlBuilder tooltipMessage = new SafeHtmlBuilder();
|
SafeHtmlBuilder tooltipMessage = new SafeHtmlBuilder();
|
||||||
|
String local="";
|
||||||
|
if(columnDefinition.getLocale()!=null && !columnDefinition.getLocale().isEmpty()){
|
||||||
|
local=" ["+columnDefinition.getLocale()+"] ";
|
||||||
|
}
|
||||||
|
|
||||||
tooltipMessage
|
tooltipMessage
|
||||||
.appendHtmlConstant("<p align='Left'><bold style='font-weight:bold;'>"
|
.appendHtmlConstant("<p align='Left'><bold style='font-weight:bold;'>"
|
||||||
+ columnDefinition.getLabel()
|
+ columnDefinition.getLabel()+local
|
||||||
+ "</bold><BR>"
|
+ "</bold><BR>"
|
||||||
+ "<em style='text-decoration:underline;'>"
|
+ "<em style='text-decoration:underline;'>"
|
||||||
+ columnDefinition.getColumnTypeName()
|
+ columnDefinition.getColumnTypeName()
|
||||||
|
|
|
@ -22,8 +22,9 @@ public class ColumnDefinition implements Serializable {
|
||||||
protected String sourceTableDimensionColumnId;
|
protected String sourceTableDimensionColumnId;
|
||||||
protected String targetTableColumnId;
|
protected String targetTableColumnId;
|
||||||
protected long targetTableId;
|
protected long targetTableId;
|
||||||
|
|
||||||
protected String label; //Label
|
protected String label; //Label
|
||||||
|
protected String locale;
|
||||||
|
|
||||||
protected ValueType valueType;
|
protected ValueType valueType;
|
||||||
protected int width;
|
protected int width;
|
||||||
protected boolean editable;
|
protected boolean editable;
|
||||||
|
@ -252,6 +253,14 @@ public class ColumnDefinition implements Serializable {
|
||||||
this.label = label;
|
this.label = label;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getLocale() {
|
||||||
|
return locale;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLocale(String locale) {
|
||||||
|
this.locale = locale;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "ColumnDefinition [id=" + id + ", columnLocalId="
|
return "ColumnDefinition [id=" + id + ", columnLocalId="
|
||||||
|
@ -259,20 +268,13 @@ public class ColumnDefinition implements Serializable {
|
||||||
+ ", sourceTableDimensionColumnId="
|
+ ", sourceTableDimensionColumnId="
|
||||||
+ sourceTableDimensionColumnId + ", targetTableColumnId="
|
+ sourceTableDimensionColumnId + ", targetTableColumnId="
|
||||||
+ targetTableColumnId + ", targetTableId=" + targetTableId
|
+ targetTableColumnId + ", targetTableId=" + targetTableId
|
||||||
+ ", label=" + label + ", valueType=" + valueType + ", width="
|
+ ", label=" + label + ", locale=" + locale + ", valueType="
|
||||||
+ width + ", editable=" + editable + ", visible=" + visible
|
+ valueType + ", width=" + width + ", editable=" + editable
|
||||||
+ ", type=" + type + ", position=" + position
|
+ ", visible=" + visible + ", type=" + type + ", position="
|
||||||
+ ", tooltipMessage=" + tooltipMessage + ", columnTypeName="
|
+ position + ", tooltipMessage=" + tooltipMessage
|
||||||
+ columnTypeName + ", columnDataType=" + columnDataType
|
+ ", columnTypeName=" + columnTypeName + ", columnDataType="
|
||||||
+ ", key=" + key + "]";
|
+ columnDataType + ", key=" + key + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue