fixed style, #1880

BuildCraft · Jun 14, 2014 · 71687ec · 71687ec
1 parent 4f8e82b
commit 71687ec
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java
@@ -92,11 +92,11 @@
 import buildcraft.core.triggers.ActionMachineControl;
 import buildcraft.core.triggers.ActionMachineControl.Mode;
 import buildcraft.core.triggers.ActionRedstoneOutput;
-import buildcraft.core.triggers.StatementIconProvider;
 import buildcraft.core.triggers.BCAction;
 import buildcraft.core.triggers.BCTrigger;
 import buildcraft.core.triggers.DefaultActionProvider;
 import buildcraft.core.triggers.DefaultTriggerProvider;
+import buildcraft.core.triggers.StatementIconProvider;
 import buildcraft.core.triggers.TriggerFluidContainer;
 import buildcraft.core.triggers.TriggerFluidContainerLevel;
 import buildcraft.core.triggers.TriggerInventory;

diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java
@@ -56,7 +56,7 @@ public StatementSlot(int x, int y, Pipe pipe, int slot) {
 		@Override
 		public String getDescription() {
 			IStatement stmt = getStatement();
-			
+
 			if (stmt != null) {
 				return stmt.getDescription();
 			} else {
@@ -260,12 +260,12 @@ public GuiGateInterface(IInventory playerInventory, Pipe pipe) {
 
 				for (int x = 0; x < 3; ++x) {
 					slots[position] = new TriggerParameterSlot(
-							8 + 18 * (x + 1), 
-							26 + 18 * y, 
+							8 + 18 * (x + 1),
+							26 + 18 * y,
 							pipe,
 							x,
 							(TriggerSlot) slots[lastPos]);
-					
+
 					position++;
 				}
 
@@ -274,10 +274,10 @@ public GuiGateInterface(IInventory playerInventory, Pipe pipe) {
 				position++;
 
 				for (int x = 0; x < 3; ++x) {
-					slots[position] = new ActionParameterSlot(							
-							98 + 18 * (x + 1), 
-							26 + 18 * y, 
-							pipe, 
+					slots[position] = new ActionParameterSlot(
+							98 + 18 * (x + 1),
+							26 + 18 * y,
+							pipe,
 							x,
 							(ActionSlot) slots[lastPos]);
 					position++;

diff --git a/common/buildcraft/transport/triggers/ActionSignalOutput.java b/common/buildcraft/transport/triggers/ActionSignalOutput.java
@@ -12,8 +12,8 @@
 
 import buildcraft.api.gates.IAction;
 import buildcraft.api.transport.PipeWire;
-import buildcraft.core.triggers.StatementIconProvider;
 import buildcraft.core.triggers.BCAction;
+import buildcraft.core.triggers.StatementIconProvider;
 import buildcraft.core.utils.StringUtils;
 
 public class ActionSignalOutput extends BCAction {

diff --git a/common/buildcraft/transport/triggers/TriggerParameterSignal.java b/common/buildcraft/transport/triggers/TriggerParameterSignal.java
@@ -38,25 +38,33 @@ public IIcon getIconToDraw() {
 
 		if (active) {
 			switch (color) {
-				case RED:
-					id = StatementIconProvider.Trigger_PipeSignal_Red_Active;
-				case BLUE:
-					id = StatementIconProvider.Trigger_PipeSignal_Blue_Active;
-				case GREEN:
-					id = StatementIconProvider.Trigger_PipeSignal_Green_Active;
-				case YELLOW:
-					id = StatementIconProvider.Trigger_PipeSignal_Yellow_Active;
+			case RED:
+				id = StatementIconProvider.Trigger_PipeSignal_Red_Active;
+				break;
+			case BLUE:
+				id = StatementIconProvider.Trigger_PipeSignal_Blue_Active;
+				break;
+			case GREEN:
+				id = StatementIconProvider.Trigger_PipeSignal_Green_Active;
+				break;
+			case YELLOW:
+				id = StatementIconProvider.Trigger_PipeSignal_Yellow_Active;
+				break;
 			}
 		} else {
 			switch (color) {
-				case RED:
-					id = StatementIconProvider.Trigger_PipeSignal_Red_Inactive;
-				case BLUE:
-					id = StatementIconProvider.Trigger_PipeSignal_Blue_Inactive;
-				case GREEN:
-					id = StatementIconProvider.Trigger_PipeSignal_Green_Inactive;
-				case YELLOW:
-					id = StatementIconProvider.Trigger_PipeSignal_Yellow_Inactive;
+			case RED:
+				id = StatementIconProvider.Trigger_PipeSignal_Red_Inactive;
+				break;
+			case BLUE:
+				id = StatementIconProvider.Trigger_PipeSignal_Blue_Inactive;
+				break;
+			case GREEN:
+				id = StatementIconProvider.Trigger_PipeSignal_Green_Inactive;
+				break;
+			case YELLOW:
+				id = StatementIconProvider.Trigger_PipeSignal_Yellow_Inactive;
+				break;
 			}
 		}