diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java index 8cea241..1f34fa6 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import org.gcube.portlets.user.td.expressionwidget.client.resources.ExpressionResources; import org.gcube.portlets.user.td.expressionwidget.client.rpc.ExpressionServiceAsync; -import org.gcube.portlets.user.td.expressionwidget.client.type.ReplaceColumnByExpressionType; +import org.gcube.portlets.user.td.expressionwidget.client.type.ReplaceExpressionType; import org.gcube.portlets.user.td.expressionwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; @@ -50,7 +50,7 @@ public class ReplaceColumnByExpressionDialog extends Window implements private ArrayList columns; private EventBus eventBus; - private ReplaceColumnByExpressionType replaceColumnByExpressionType; + private ReplaceExpressionType replaceExpressionType; // private String columnLocalId; private TRId trId; @@ -82,7 +82,7 @@ public class ReplaceColumnByExpressionDialog extends Window implements columns.add(col); } - replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template; + replaceExpressionType = ReplaceExpressionType.Template; initWindow(); sanitizesColumns(); create(); @@ -101,7 +101,7 @@ public class ReplaceColumnByExpressionDialog extends Window implements this.trId = trId; column = new ColumnData(); column.setColumnId(columnId); - replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace; + replaceExpressionType = ReplaceExpressionType.Replace; initWindow(); load(); @@ -137,7 +137,7 @@ public class ReplaceColumnByExpressionDialog extends Window implements protected void create() { replaceColumnByExpressionPanel = new ReplaceColumnByExpressionPanel( - this, column, columns, eventBus, replaceColumnByExpressionType); + this, column, columns, eventBus, replaceExpressionType); add(replaceColumnByExpressionPanel); } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java index 5b09ee9..9ec337c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java @@ -5,7 +5,7 @@ import java.util.Date; import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.expressionwidget.client.resources.ExpressionResources; -import org.gcube.portlets.user.td.expressionwidget.client.type.ReplaceColumnByExpressionType; +import org.gcube.portlets.user.td.expressionwidget.client.type.ReplaceExpressionType; import org.gcube.portlets.user.td.expressionwidget.shared.exception.ConditionTypeMapException; import org.gcube.portlets.user.td.expressionwidget.shared.exception.ReplaceTypeMapException; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; @@ -86,7 +86,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel { private ColumnData column; private ArrayList columns; - private ReplaceColumnByExpressionType replaceColumnByExpressionType; + private ReplaceExpressionType replaceExpressionType; private DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd"); @@ -111,13 +111,13 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel { public ReplaceColumnByExpressionPanel( ReplaceColumnByExpressionDialog parent, ColumnData column, ArrayList columns, EventBus eventBus, - ReplaceColumnByExpressionType replaceColumnByExpressionType) { + ReplaceExpressionType replaceExpressionType) { super(); this.parent = parent; this.column = column; this.columns = columns; this.eventBus = eventBus; - this.replaceColumnByExpressionType = replaceColumnByExpressionType; + this.replaceExpressionType = replaceExpressionType; Log.debug("Column: " + column); Log.debug("Columns: " + columns); init(); @@ -330,7 +330,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel { ColumnDataType.Numeric.toString()) == 0 || column.getDataTypeName().compareTo( ColumnDataType.Geometry.toString()) == 0) { - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Replace: replaceWidget = new ReplaceWidget(column, REPLACEWIDTH, REPLACEHEIGHT, eventBus); @@ -522,7 +522,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel { return; } - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Template: C_ExpressionContainer conditionExpressionContainer; if (allRows) { @@ -562,7 +562,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel { return; } - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Template: C_ExpressionContainer conditionExpressionContainer; if (allRows) { @@ -669,7 +669,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel { } protected void close() { - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Template: ExpressionWrapper exWrapper=new ExpressionWrapper(); ExpressionWrapperEvent expressionEvent = new ExpressionWrapperEvent( diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceWidget.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceWidget.java index a0a4e9c..42e08d1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceWidget.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceWidget.java @@ -6,7 +6,7 @@ import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataP import org.gcube.portlets.user.td.expressionwidget.client.properties.ReplaceElement; import org.gcube.portlets.user.td.expressionwidget.client.properties.ReplaceElementProperties; import org.gcube.portlets.user.td.expressionwidget.client.properties.ReplaceElementStore; -import org.gcube.portlets.user.td.expressionwidget.client.type.ReplaceColumnByExpressionType; +import org.gcube.portlets.user.td.expressionwidget.client.type.ReplaceExpressionType; import org.gcube.portlets.user.td.expressionwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.expressionwidget.shared.exception.ReplaceTypeMapException; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.arithmetic.C_ArithmeticExpression; @@ -85,7 +85,7 @@ public class ReplaceWidget extends SimpleContainer { private String itemIdFirstArg; private String itemIdSecondArg; private String itemIdHoriz; - private ReplaceColumnByExpressionType replaceColumnByExpressionType; + private ReplaceExpressionType replaceExpressionType; private ColumnDataType targetColumnType; @@ -121,7 +121,7 @@ public class ReplaceWidget extends SimpleContainer { public ReplaceWidget(ColumnData column, EventBus eventBus) { super(); this.column=column; - replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace; + replaceExpressionType = ReplaceExpressionType.Replace; ColumnDataType targetType = ColumnDataType .getColumnDataTypeFromId(column.getDataTypeName()); create(column.getTrId(), targetType, WIDTH, HEIGHT, eventBus); @@ -132,7 +132,7 @@ public class ReplaceWidget extends SimpleContainer { EventBus eventBus) { super(); this.column=column; - replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace; + replaceExpressionType = ReplaceExpressionType.Replace; ColumnDataType targetType = ColumnDataType .getColumnDataTypeFromId(column.getDataTypeName()); create(column.getTrId(), targetType, width, height, eventBus); @@ -143,7 +143,7 @@ public class ReplaceWidget extends SimpleContainer { EventBus eventBus) { super(); this.column=column; - replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template; + replaceExpressionType = ReplaceExpressionType.Template; ColumnDataType targetType = ColumnDataType .getColumnDataTypeFromId(column.getDataTypeName()); create(column.getTrId(), targetType, WIDTH, HEIGHT, eventBus); @@ -154,12 +154,35 @@ public class ReplaceWidget extends SimpleContainer { String width, String height, EventBus eventBus) { super(); this.column=column; - replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template; + replaceExpressionType = ReplaceExpressionType.Template; ColumnDataType targetType = ColumnDataType .getColumnDataTypeFromId(column.getDataTypeName()); create(column.getTrId(), targetType, width, height, eventBus); columnsConfig(columns); } + + public ReplaceWidget(ColumnData column, ArrayList columns, + EventBus eventBus, ReplaceExpressionType type) { + super(); + this.column=column; + replaceExpressionType = type; + ColumnDataType targetType = ColumnDataType + .getColumnDataTypeFromId(column.getDataTypeName()); + create(column.getTrId(), targetType, WIDTH, HEIGHT, eventBus); + columnsConfig(columns); + } + + public ReplaceWidget(ColumnData column, ArrayList columns, + String width, String height, EventBus eventBus,ReplaceExpressionType type) { + super(); + this.column=column; + replaceExpressionType = type; + ColumnDataType targetType = ColumnDataType + .getColumnDataTypeFromId(column.getDataTypeName()); + create(column.getTrId(), targetType, width, height, eventBus); + columnsConfig(columns); + } + protected void create(TRId trId, ColumnDataType targetColumnType, String width, String height, EventBus eventBus) { @@ -1025,8 +1048,9 @@ public class ReplaceWidget extends SimpleContainer { * ColumnDataType cType = ColumnDataType * .getColumnDataTypeFromId(column.getDataTypeName()); */ - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Replace: + case AddColumn: expLeaf = mapReplace.map( columnOfCombo, ColumnDataType.Text, @@ -1069,8 +1093,9 @@ public class ReplaceWidget extends SimpleContainer { if (expContainerOperation == null) { return null; } else { - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Replace: + case AddColumn: exp = mapReplace.map( columnOfCombo, targetType, @@ -1143,8 +1168,9 @@ public class ReplaceWidget extends SimpleContainer { cType = ColumnDataType.getColumnDataTypeFromId(columnOfCombo .getDataTypeName()); - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Replace: + case AddColumn: expLeaf = mapReplace.map( columnOfCombo, cType, @@ -1186,8 +1212,9 @@ public class ReplaceWidget extends SimpleContainer { if (expContainerOperation == null) { return null; } else { - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Replace: + case AddColumn: exp = mapReplace.map( columnOfCombo, targetType, @@ -1240,8 +1267,9 @@ public class ReplaceWidget extends SimpleContainer { } } else { - switch (replaceColumnByExpressionType) { + switch (replaceExpressionType) { case Replace: + case AddColumn: exp = mapReplace.map( columnOfCombo, targetType, diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionPanel.java index 25a9b2d..6da8ddd 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionPanel.java @@ -247,9 +247,24 @@ public class ReplaceExpressionPanel extends FramedPanel { ColumnDataType.Numeric.toString()) == 0 || column.getDataTypeName().compareTo( ColumnDataType.Geometry.toString()) == 0) { - - replaceWidget = new ReplaceWidget(column, columns, - REPLACEWIDTH, REPLACEHEIGHT, eventBus); + switch(type){ + case AddColumn: + replaceWidget = new ReplaceWidget(column, columns, + REPLACEWIDTH, REPLACEHEIGHT, eventBus,type); + break; + case Replace: + replaceWidget = new ReplaceWidget(column, columns, + REPLACEWIDTH, REPLACEHEIGHT, eventBus, type); + break; + case Template: + replaceWidget = new ReplaceWidget(column, columns, + REPLACEWIDTH, REPLACEHEIGHT, eventBus); + break; + default: + break; + + } + replaceValueFieldSetLayout.add(replaceWidget, new VerticalLayoutData(1, -1)); @@ -390,6 +405,7 @@ public class ReplaceExpressionPanel extends FramedPanel { close(); break; case Replace: + case AddColumn: exWrapper = new ExpressionWrapper( replaceValue, column.getTrId(), column.getColumnId(), column.getName()); expressionWrapperNotification=new ExpressionWrapperNotification(exWrapper); @@ -432,6 +448,7 @@ public class ReplaceExpressionPanel extends FramedPanel { close(); break; case Replace: + case AddColumn: replaceExpressionContainer = new C_ExpressionContainer( C_ExpressionContainer.Contains.C_Expression, cReplaceExpression, replaceWidget.getReadableExpression()); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java index 2a2392d..afca76f 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java @@ -3,9 +3,8 @@ */ package org.gcube.portlets.user.td.expressionwidget.client.rpc; - - import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; +import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.FilterColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnByExpressionSession; @@ -36,12 +35,14 @@ public interface ExpressionService extends RemoteService { * @param columnFilterSession * @throws ExpressionServiceException */ - public String startFilterColumn(FilterColumnSession filterColumnSession) throws TDGWTServiceException; - - - public String startReplaceColumnByExpression(ReplaceColumnByExpressionSession replaceColumnByExpressionColumnSession) throws TDGWTServiceException; - - - + public String startFilterColumn(FilterColumnSession filterColumnSession) + throws TDGWTServiceException; + + public String startReplaceColumnByExpression( + ReplaceColumnByExpressionSession replaceColumnByExpressionColumnSession) + throws TDGWTServiceException; + + public String startAddColumn(AddColumnSession addColumnSession) + throws TDGWTServiceException; } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java index fa4ef44..bf8036d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java @@ -3,6 +3,7 @@ */ package org.gcube.portlets.user.td.expressionwidget.client.rpc; +import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.FilterColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnByExpressionSession; @@ -21,9 +22,14 @@ public interface ExpressionServiceAsync { public static ExpressionServiceAsync INSTANCE = (ExpressionServiceAsync) GWT .create(ExpressionService.class); - void startFilterColumn(FilterColumnSession filterColumnSession,AsyncCallback callback); - - void startReplaceColumnByExpression(ReplaceColumnByExpressionSession replaceColumnByExpressionSession,AsyncCallback callback); - - + void startFilterColumn(FilterColumnSession filterColumnSession, + AsyncCallback callback); + + void startReplaceColumnByExpression( + ReplaceColumnByExpressionSession replaceColumnByExpressionSession, + AsyncCallback callback); + + void startAddColumn(AddColumnSession addColumnSession, + AsyncCallback callback); + } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/type/ReplaceColumnByExpressionType.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/type/ReplaceColumnByExpressionType.java deleted file mode 100644 index df03235..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/type/ReplaceColumnByExpressionType.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.client.type; - -/** - * - * @author giancarlo - * email: g.panichi@isti.cnr.it - * - */ -public enum ReplaceColumnByExpressionType { - Replace, Template; -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java index 98fef38..30b6273 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java @@ -21,6 +21,8 @@ import org.gcube.portlets.user.td.gwtservice.server.SessionUtil; import org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl; import org.gcube.portlets.user.td.gwtservice.server.trservice.TabularResourceTypeMap; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; +import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnMockUp; +import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.FilterColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnByExpressionSession; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; @@ -31,8 +33,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author giancarlo email: g.panichi@isti.cnr.it * */ public class ExpressionServiceImpl extends RemoteServiceServlet implements @@ -67,7 +69,7 @@ public class ExpressionServiceImpl extends RemoteServiceServlet implements filterColumnSession); C_ExpressionParser parser = new C_ExpressionParser(); - Expression expression; + Expression expression=null; try { expression = parser.parse(filterColumnSession.getCexpression()); } catch (ExpressionParserException e) { @@ -87,8 +89,57 @@ public class ExpressionServiceImpl extends RemoteServiceServlet implements throw e; } catch (Throwable e) { e.printStackTrace(); - throw new TDGWTServiceException("Filter Failed on Service: " - + e.getLocalizedMessage()); + throw new TDGWTServiceException(e.getLocalizedMessage()); + } + } + + /** + * + * {@inheritDoc} + */ + + public String startAddColumn(AddColumnSession addColumnSession) + throws TDGWTServiceException { + + try { + logger.debug("AddColumn"); + HttpSession session = this.getThreadLocalRequest().getSession(); + logger.debug("Session: " + session); + + if (addColumnSession == null) { + logger.error("AddColumnSession is null"); + new ExpressionServiceException("AddColumnSession is null"); + } + + ColumnMockUp columnMockUp = addColumnSession.getColumnMockUp(); + + Expression expression=null; + if (columnMockUp.hasExpression()) { + + C_ExpressionParser parser = new C_ExpressionParser(); + + try { + expression = parser.parse(columnMockUp.getExpression()); + } catch (ExpressionParserException e) { + logger.debug(e.getLocalizedMessage()); + throw new TDGWTServiceException(e.getLocalizedMessage()); + } + logger.debug("Service Expression:" + expression); + + } + + TDGWTServiceImpl gwtService = new TDGWTServiceImpl(); + + String taskId = gwtService.startAddColumn(addColumnSession, + expression, session); + + return taskId; + + } catch (TDGWTServiceException e) { + throw e; + } catch (Throwable e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } } @@ -116,7 +167,7 @@ public class ExpressionServiceImpl extends RemoteServiceServlet implements C_ExpressionParser parser = new C_ExpressionParser(); - Expression conditionExpression=null; + Expression conditionExpression = null; if (!replaceColumnByExpressionSession.isAllRows()) { try { conditionExpression = parser @@ -136,8 +187,7 @@ public class ExpressionServiceImpl extends RemoteServiceServlet implements replaceExpression = parser .parse(replaceColumnByExpressionSession .getcReplaceExpression()); - logger.debug("Service Replace Expression:" - + replaceExpression); + logger.debug("Service Replace Expression:" + replaceExpression); } TDGWTServiceImpl gwtService = new TDGWTServiceImpl(); @@ -152,8 +202,7 @@ public class ExpressionServiceImpl extends RemoteServiceServlet implements } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException( - "Error in startReplaceColumnByExpression:" - + e.getLocalizedMessage()); + e.getLocalizedMessage()); } } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java index 4660057..893a001 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java @@ -81,7 +81,7 @@ public class ConditionTypeMap { C_ColumnReferencePlaceholder placeHolder = new C_ColumnReferencePlaceholder( dataType, column.getColumnId()); Log.debug("placeHolder:" + placeHolder); - String readablePlaceHolder = column.getColumnId(); + String readablePlaceHolder = column.getLabel(); TD_Value fArg; TD_Value sArg; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java index a04760d..ee922ba 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java @@ -212,10 +212,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=ColumnDataType.Text){ placeHolder=new C_Cast(placeH, ColumnDataType.Text); - readablePlaceHolder= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -250,10 +250,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=ColumnDataType.Text){ placeHolder=new C_Cast(placeH, ColumnDataType.Text); - readablePlaceHolder= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -289,10 +289,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=ColumnDataType.Text){ placeHolder=new C_Cast(placeH, ColumnDataType.Text); - readablePlaceHolder= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -325,10 +325,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=ColumnDataType.Text){ placeHolder=new C_Cast(placeH, ColumnDataType.Text); - readablePlaceHolder= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -357,10 +357,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=targetType){ placeHolder=new C_Cast(placeH, targetType); - readablePlaceHolder= "Cast("+column.getColumnId()+","+targetType+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+targetType+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -385,10 +385,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=ColumnDataType.Text){ placeHolder=new C_Cast(placeH, ColumnDataType.Text); - readablePlaceHolder= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -415,10 +415,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=ColumnDataType.Text){ placeHolder=new C_Cast(placeH, ColumnDataType.Text); - readablePlaceHolder= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -444,10 +444,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=ColumnDataType.Text){ placeHolder=new C_Cast(placeH, ColumnDataType.Text); - readablePlaceHolder= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -474,10 +474,10 @@ public class ReplaceTypeMap { String readablePlaceHolder; if(dataType!=ColumnDataType.Text){ placeHolder=new C_Cast(placeH, ColumnDataType.Text); - readablePlaceHolder= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readablePlaceHolder= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { placeHolder=placeH; - readablePlaceHolder= column.getColumnId(); + readablePlaceHolder= column.getLabel(); } Log.debug("placeHolder:" + placeHolder); @@ -647,10 +647,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=ColumnDataType.Text){ columnReference=new C_Cast(columnRef,ColumnDataType.Text); - readableColumnReference= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readableColumnReference= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference); @@ -686,10 +686,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=ColumnDataType.Text){ columnReference=new C_Cast(columnRef,ColumnDataType.Text); - readableColumnReference= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readableColumnReference= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference); @@ -727,10 +727,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=ColumnDataType.Text){ columnReference=new C_Cast(columnRef,ColumnDataType.Text); - readableColumnReference= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readableColumnReference= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference); @@ -764,10 +764,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=ColumnDataType.Text){ columnReference=new C_Cast(columnRef,ColumnDataType.Text); - readableColumnReference= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readableColumnReference= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference); @@ -798,10 +798,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=targetType){ columnReference=new C_Cast(columnRef,targetType); - readableColumnReference= "Cast("+column.getColumnId()+","+targetType+")"; + readableColumnReference= "Cast("+column.getLabel()+","+targetType+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference); @@ -827,10 +827,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=ColumnDataType.Text){ columnReference=new C_Cast(columnRef,ColumnDataType.Text); - readableColumnReference= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readableColumnReference= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference); @@ -859,10 +859,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=ColumnDataType.Text){ columnReference=new C_Cast(columnRef,ColumnDataType.Text); - readableColumnReference= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readableColumnReference= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference); @@ -892,10 +892,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=ColumnDataType.Text){ columnReference=new C_Cast(columnRef,ColumnDataType.Text); - readableColumnReference= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readableColumnReference= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference); @@ -924,10 +924,10 @@ public class ReplaceTypeMap { String readableColumnReference; if(dataType!=ColumnDataType.Text){ columnReference=new C_Cast(columnRef,ColumnDataType.Text); - readableColumnReference= "Cast("+column.getColumnId()+","+ColumnDataType.Text+")"; + readableColumnReference= "Cast("+column.getLabel()+","+ColumnDataType.Text+")"; } else { columnReference=columnRef; - readableColumnReference= column.getColumnId(); + readableColumnReference= column.getLabel(); } Log.debug("Typed Column Reference:" + columnReference);