[Advance-project-commit] SF.net SVN: advance-project:[337] advance-live-reporter-os

[<cs...@us...>]

Revision: 337
          http://sourceforge.net/p/advance-project/code/337
Author:   csirobi
Date:     2013-11-13 13:36:02 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
L2: "direction" tag of json minor changes

Modified Paths:
--------------
    advance-live-reporter-os/WebContent/warehouse-header.jspf
    advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java

Modified: advance-live-reporter-os/WebContent/warehouse-header.jspf
===================================================================
--- advance-live-reporter-os/WebContent/warehouse-header.jspf	2013-11-11 18:37:11 UTC (rev 336)
+++ advance-live-reporter-os/WebContent/warehouse-header.jspf	2013-11-13 13:36:02 UTC (rev 337)
@@ -32,6 +32,7 @@
       String whName = ObjectUtils.nvl(request.getParameter("warehouse_name"), warehouseSwitch.getFirstWarehousePairTop());
       String whOption = ObjectUtils.nvl(request.getParameter("warehouse_option"), "A");
       String stOrder = ObjectUtils.nvl(request.getParameter("storage_order"), "PHYSICAL");
+      //Real values are set by l2_l3 form at the l2 jsp page.
       String whL3Option = ObjectUtils.nvl(request.getParameter("warehouse_l3_option"), "LEFT");
       String whL3StId = ObjectUtils.nvl(request.getParameter("warehouse_l3_storage_id"), "0");
       String whL3Name = ObjectUtils.nvl(request.getParameter("warehouse_l3_name"), warehouseSwitch.getFirstWarehousePairTop());

Modified: advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java
===================================================================
--- advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java	2013-11-11 18:37:11 UTC (rev 336)
+++ advance-live-reporter-os/src/eu/advance/logistics/live/reporter/charts/L2Chart.java	2013-11-13 13:36:02 UTC (rev 337)
@@ -194,36 +194,19 @@
 		for (L2DisplaySide dsKey : L2DisplaySide.values()) {
 			JSONObject dsRecord = new JSONObject();
 			switch (ws.getL2WarehouseOption()) {
-			case A:
-			{
-        dsRecord.put("align", WarehouseSide.values()[dsKey.ordinal()].name().toLowerCase());
-        dsRecord.put("warehouseName", ws.getWarehouse());
-        dsRecord.put("warehouseInfo", ws.getWarehouseType().name());
-        break;
-			}
+      case A:			
 			case B:
-			{
         dsRecord.put("align", WarehouseSide.values()[dsKey.ordinal()].name().toLowerCase());
-        dsRecord.put("warehouseName", ws.getPair());
         dsRecord.put("warehouseInfo", ws.getWarehouseType().name());
         break;
-			}
 			case LEFT:
-			{
         dsRecord.put("align", WarehouseSide.LEFT.toString().toLowerCase());
-        String wh = (dsKey == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
-        dsRecord.put("warehouseName", wh);
         dsRecord.put("warehouseInfo", WarehouseType.values()[dsKey.ordinal()].name());
         break;
-			}
 			case RIGHT:
-			{
         dsRecord.put("align", WarehouseSide.RIGHT.toString().toLowerCase());
-        String wh = (dsKey == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
-        dsRecord.put("warehouseName", wh);
         dsRecord.put("warehouseInfo", WarehouseType.values()[dsKey.ordinal()].name());
         break;
-			}
 			default:
 			}
 			dsRecord.put("at_hub", L2TimeState.NOW_AT_HUB.getMessage());
@@ -245,24 +228,18 @@
 	{
 	  String res = "";
 	  
-	  switch(ws.getL2WarehouseOption())
-	  {
+	  switch(ws.getL2WarehouseOption()) {
 	    case A:
-	    {
 	      res = ws.getWarehouse();
 	      break;
-	    }
 	    case B:
-	    {
 	      res = ws.getPair();
 	      break;
-	    }
 	    case LEFT:
 	    case RIGHT:  
-	    {
 	      res = (ds == L2DisplaySide.LEFT) ? ws.getWarehouse() : ws.getPair();
 	      break;
-	    }
+	    default:	      
 	  }
 	  
 	  return res;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.