Fix unintentional layout changes

Author: SamCarlberg

core/src/main/java/edu/wpi/grip/core/http/GripServer.java

@@ -79,6 +79,36 @@ public class GripServer {
    */
   private State state = State.PRE_RUN;
 
+  /**
+   * Possible lifecycle states of the server.
+   */
+  public enum State {
+    /**
+     * The server has not been started yet.
+     */
+    PRE_RUN,
+    /**
+     * The server is currently running.
+     */
+    RUNNING,
+    /**
+     * The server was running and has been stopped.
+     */
+    STOPPED
+  }
+
+  public interface JettyServerFactory {
+    Server create(int port);
+  }
+
+  public static class JettyServerFactoryImpl implements JettyServerFactory {
+
+    @Override
+    public Server create(int port) {
+      return new Server(port);
+    }
+  }
+
   @Inject
   GripServer(ContextStore contextStore,
              JettyServerFactory serverFactory,
@@ -202,34 +232,4 @@ public void settingsChanged(ProjectSettingsChangedEvent event) {
     }
   }
 
-  /**
-   * Possible lifecycle states of the server.
-   */
-  public enum State {
-    /**
-     * The server has not been started yet.
-     */
-    PRE_RUN,
-    /**
-     * The server is currently running.
-     */
-    RUNNING,
-    /**
-     * The server was running and has been stopped.
-     */
-    STOPPED
-  }
-
-  public interface JettyServerFactory {
-    Server create(int port);
-  }
-
-  public static class JettyServerFactoryImpl implements JettyServerFactory {
-
-    @Override
-    public Server create(int port) {
-      return new Server(port);
-    }
-  }
-
 }

core/src/main/java/edu/wpi/grip/core/operations/Operations.java

@@ -189,7 +189,7 @@ ImmutableList<OperationMetaData> operations() {
   }
 
   /**
-   * Adds operations and posts an {@link OperationAddedEvent} for each one.
+   * Submits all operations for addition on the {@link EventBus}.
    */
   public void addOperations() {
     operations.stream()

core/src/test/java/edu/wpi/grip/core/PipelineRunnerTest.java

@@ -37,6 +37,31 @@
 @RunWith(Enclosed.class)
 public class PipelineRunnerTest {
 
+  interface SimpleOperation extends Operation {
+    OperationDescription DESCRIPTION = OperationDescription.builder()
+        .name("Simple Operation")
+        .summary("A simple operation for testing")
+        .build();
+
+    @Override
+    default List<InputSocket> getInputSockets() {
+      return ImmutableList.of(
+          new MockInputSocket("Test Socket") {
+            @Override
+            public boolean dirtied() {
+              return true;
+            }
+          }
+      );
+    }
+
+
+    @Override
+    default List<OutputSocket> getOutputSockets() {
+      return ImmutableList.of();
+    }
+  }
+
   public static class SimpleTests {
     private FailureListener failureListener;
 
@@ -350,31 +375,6 @@ public void cleanUp() {
     }
   }
 
-  interface SimpleOperation extends Operation {
-    OperationDescription DESCRIPTION = OperationDescription.builder()
-        .name("Simple Operation")
-        .summary("A simple operation for testing")
-        .build();
-
-    @Override
-    default List<InputSocket> getInputSockets() {
-      return ImmutableList.of(
-          new MockInputSocket("Test Socket") {
-            @Override
-            public boolean dirtied() {
-              return true;
-            }
-          }
-      );
-    }
-
-
-    @Override
-    default List<OutputSocket> getOutputSockets() {
-      return ImmutableList.of();
-    }
-  }
-
   static class FailureListener extends Service.Listener {
     private Service.State failedFrom = null;
     private Throwable failure = null;

ui/src/main/java/edu/wpi/grip/ui/pipeline/AddSourceView.java

@@ -65,33 +65,6 @@ public class AddSourceView extends HBox {
   private final Button ipcamButton;
   private Optional<Dialog> activeDialog = Optional.empty();
 
-  private static class SourceDialog extends Dialog<ButtonType> {
-    private final Text errorText = new Text();
-
-    private SourceDialog(final Parent root, Control inputField) {
-      super();
-
-      this.getDialogPane().getStyleClass().add(SOURCE_DIALOG_STYLE_CLASS);
-
-      final GridPane gridContent = new GridPane();
-      gridContent.setMaxWidth(Double.MAX_VALUE);
-      GridPane.setHgrow(inputField, Priority.ALWAYS);
-      GridPane.setHgrow(errorText, Priority.NEVER);
-      errorText.wrappingWidthProperty().bind(inputField.widthProperty());
-      gridContent.add(errorText, 0, 0);
-      gridContent.add(inputField, 0, 1);
-
-      getDialogPane().setContent(gridContent);
-      getDialogPane().setStyle(root.getStyle());
-      getDialogPane().getStylesheets().addAll(root.getStylesheets());
-      getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
-    }
-  }
-
-  public interface Factory {
-    AddSourceView create();
-  }
-
   @Inject
   AddSourceView(EventBus eventBus,
                 MultiImageFileSource.Factory multiImageSourceFactory,
@@ -322,4 +295,31 @@ void closeDialogs() {
       }
     });
   }
+
+  public interface Factory {
+    AddSourceView create();
+  }
+
+  private static class SourceDialog extends Dialog<ButtonType> {
+    private final Text errorText = new Text();
+
+    private SourceDialog(final Parent root, Control inputField) {
+      super();
+
+      this.getDialogPane().getStyleClass().add(SOURCE_DIALOG_STYLE_CLASS);
+
+      final GridPane gridContent = new GridPane();
+      gridContent.setMaxWidth(Double.MAX_VALUE);
+      GridPane.setHgrow(inputField, Priority.ALWAYS);
+      GridPane.setHgrow(errorText, Priority.NEVER);
+      errorText.wrappingWidthProperty().bind(inputField.widthProperty());
+      gridContent.add(errorText, 0, 0);
+      gridContent.add(inputField, 0, 1);
+
+      getDialogPane().setContent(gridContent);
+      getDialogPane().setStyle(root.getStyle());
+      getDialogPane().getStylesheets().addAll(root.getStylesheets());
+      getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
+    }
+  }
 }