fixed comment-label for infix-command-blocks

src/main/java/edu/mit/blocks/codeblocks/InfixBlockShape.java

@@ -48,9 +48,8 @@ public class InfixBlockShape extends BlockShape {
             // Trying left-aligned ports
         	
         	//added by letsgoING
-    		//TODO: TEST
         	BlockConnector socket = block.getSocketAt(0);
-        	int socketLabelOffset =  (int) Math.max(socket.getLabel().length(), COMMAND_PORT_OFFSET);
+        	int socketLabelOffset =  (int) Math.max(socket.getLabel().length(), BOTTOM_SOCKET_MIDDLE_SPACER);
       
             Point2D p = BCS.addControlConnectorShape(gpBottom, socketLabelOffset + blockCornerRadius, true);
             rb.updateSocketPoint(block.getAfterConnector(), p);
@@ -75,7 +74,6 @@ public class InfixBlockShape extends BlockShape {
 	                            (float) gpBottom.getCurrentPoint().getY());
 	                }
             	} else { //added by letsgoING
-            		//TODO: TEST
             		if (socketCounter > 0) {
 	                    gpBottom.lineTo(
 	                            (float) gpBottom.getCurrentPoint().getX() + rb.getSocketLabelWidth(socketCounter),

src/main/java/edu/mit/blocks/renderable/CommentLabel.java

@@ -45,7 +45,7 @@ public class CommentLabel extends BlockControlLabel {
                 y -= 2;
             }
 
-            if (rb.getBlock().isInfix() && rb.getBlock().getSocketAt(0) != null) {
+            if (rb.getBlock().isInfix() && rb.getBlock().getSocketAt(0) != null && !rb.getBlock().isCommandBlock()) { //&& !rb.getBlock().isCommandBlock() added by letsgoING
                 if (!rb.getBlock().getSocketAt(0).hasBlock()) {
                     x += 30;
                 } else {