CRNT-25723

1)Formatted DataCommandHandler to remove trailing whitespaces

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58589 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 7 insertions, 10 deletions

diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/DataCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/DataCommandHandler.java
index eccb734..6088099 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/DataCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/DataCommandHandler.java
@@ -58,14 +58,13 @@ public class DataCommandHandler
    public void createData(LaneSymbol parentLaneSymbol, JsonObject request)

    {

       ModelType model = ModelUtils.findContainingModel(parentLaneSymbol);

-      ProcessDefinitionType processDefinition = ModelUtils

-            .findContainingProcess(parentLaneSymbol);

+      ProcessDefinitionType processDefinition = ModelUtils.findContainingProcess(parentLaneSymbol);

       String dataFullID = extractString(request, ModelerConstants.DATA_FULL_ID_PROPERTY);

       String dataID = extractString(request, ModelerConstants.DATA_ID_PROPERTY);

       String dataName = extractString(request, ModelerConstants.DATA_NAME_PROPERTY);

       int xProperty = extractInt(request, ModelerConstants.X_PROPERTY) - ModelerConstants.POOL_LANE_MARGIN;

-      int yProperty = extractInt(request, ModelerConstants.Y_PROPERTY)- ModelerConstants.POOL_LANE_MARGIN

-				- ModelerConstants.POOL_SWIMLANE_TOP_BOX_HEIGHT;

+      int yProperty = extractInt(request, ModelerConstants.Y_PROPERTY) - ModelerConstants.POOL_LANE_MARGIN

+            - ModelerConstants.POOL_SWIMLANE_TOP_BOX_HEIGHT;

       int widthProperty = extractInt(request, ModelerConstants.WIDTH_PROPERTY);

       int heightProperty = extractInt(request, ModelerConstants.HEIGHT_PROPERTY);

 

@@ -89,9 +88,8 @@ public class DataCommandHandler
             }

          }

 

-         DataSymbolType dataSymbol = getModelBuilderFacade().createDataSymbol(model, data,

-               processDefinition, parentLaneSymbol.getId(), xProperty, yProperty,

-               widthProperty, heightProperty);

+         DataSymbolType dataSymbol = getModelBuilderFacade().createDataSymbol(model, data, processDefinition,

+               parentLaneSymbol.getId(), xProperty, yProperty, widthProperty, heightProperty);

          mapper.map(dataSymbol);

       }

    }

@@ -109,8 +107,7 @@ public class DataCommandHandler
       Long dataOID = extractLong(request, ModelerConstants.OID_PROPERTY);

       String dataFullID = extractString(request, ModelerConstants.DATA_FULL_ID_PROPERTY);

       DataType data = getModelBuilderFacade().importData(model, dataFullID);

-      DataSymbolType dataSymbol = getModelBuilderFacade().findDataSymbolRecursively(parentLaneSymbol,

-            dataOID);

+      DataSymbolType dataSymbol = getModelBuilderFacade().findDataSymbolRecursively(parentLaneSymbol, dataOID);

       synchronized (model)

       {

          data.getDataSymbols().remove(dataSymbol);

@@ -124,7 +121,7 @@ public class DataCommandHandler
    {

       return springContext.getBean(ModelService.class);

    }

-   

+

    private ModelBuilderFacade getModelBuilderFacade()

    {

       if (modelBuilderFacade == null)