Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,6 @@ project(":ui") {
compile project(path: ':core', configuration: 'shadow')
ideProvider project(path: ':core', configuration: 'compile')
compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.10'
compile group: 'org.apache.ant', name: 'ant-jsch', version: '1.8.1'
compile group: 'com.jcabi', name: 'jcabi-ssh', version: '1.5'
compile group: 'org.jdeferred', name: 'jdeferred-core', version: '1.2.4'
testCompile files(project(':core').sourceSets.test.output.classesDir)
testCompile files(project(':core').sourceSets.test.output.resourcesDir)
testCompile group: 'org.testfx', name: 'testfx-core', version: '4.0.+'
Expand Down
7 changes: 2 additions & 5 deletions core/src/main/java/edu/wpi/grip/core/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ public class Main {
@Inject
private Logger logger;

public static void main(String[] args) throws IOException, InterruptedException {
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
public static void main(String[] args) throws Exception {
final Injector injector = Guice.createInjector(new GRIPCoreModule());
injector.getInstance(Main.class).start(args);
}

@SuppressWarnings("PMD.SystemPrintln")
public void start(String[] args) throws IOException, InterruptedException {
if (args.length != 1) {
System.err.println("Usage: GRIP.jar project.grip");
Expand Down Expand Up @@ -69,9 +69,6 @@ public void start(String[] args) throws IOException, InterruptedException {
// Open a project from a .grip file specified on the command line
project.open(new File(projectPath));


// This is done in order to indicate to the user using the deployment UI that this is running
System.out.println("SUCCESS! The project is running in headless mode!");
// There's nothing more to do in the main thread since we're in headless mode - sleep forever
for (; ; ) {
Thread.sleep(Integer.MAX_VALUE);
Expand Down
130 changes: 0 additions & 130 deletions ui/src/main/java/edu/wpi/grip/ui/DeployerController.java

This file was deleted.

5 changes: 0 additions & 5 deletions ui/src/main/java/edu/wpi/grip/ui/GRIPUIModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import edu.wpi.grip.core.Source;
import edu.wpi.grip.ui.annotations.ParametrizedController;
import edu.wpi.grip.ui.components.StartStoppableButton;
import edu.wpi.grip.ui.deployment.FRCAdvancedDeploymentOptionsController;
import edu.wpi.grip.ui.deployment.FRCDeploymentOptionsController;
import edu.wpi.grip.ui.pipeline.OutputSocketController;
import edu.wpi.grip.ui.pipeline.SocketHandleView;
import edu.wpi.grip.ui.pipeline.StepController;
Expand Down Expand Up @@ -70,9 +68,6 @@ public <I> void hear(final TypeLiteral<I> typeLiteral, TypeEncounter<I> typeEnco
install(new FactoryModuleBuilder().build(OperationController.Factory.class));
install(new FactoryModuleBuilder().build(SocketHandleView.Factory.class));
install(new FactoryModuleBuilder().build(OutputSocketController.Factory.class));
install(new FactoryModuleBuilder().build(DeployerController.Factory.class));
install(new FactoryModuleBuilder().build(FRCDeploymentOptionsController.Factory.class));
install(new FactoryModuleBuilder().build(FRCAdvancedDeploymentOptionsController.Factory.class));
// End arbitrary controllers

// InputSocketController Factories
Expand Down
19 changes: 0 additions & 19 deletions ui/src/main/java/edu/wpi/grip/ui/MainWindowController.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.scene.Parent;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.control.Dialog;
import javafx.scene.control.SplitPane;
Expand Down Expand Up @@ -40,8 +39,6 @@ public class MainWindowController {
private Palette palette;
@Inject
private Project project;
@Inject
private DeployerController.Factory deployerControllerFactoy;

public void initialize() {
pipelineView.prefHeightProperty().bind(bottomPane.heightProperty());
Expand Down Expand Up @@ -167,21 +164,5 @@ public void quit() {
Platform.exit();
}
}

@FXML
public void deployFRC() {
if (project.getFile().isPresent()) {
final DeployerController deployerController = deployerControllerFactoy.create();
final Dialog<ButtonType> dialog = new Dialog();
dialog.setDialogPane(deployerController.getRoot());
dialog.setResizable(true);
dialog.showAndWait();
} else {
final Alert alert = new Alert(Alert.AlertType.INFORMATION,
"You must have saved your project before it can be deployed to a remote device.");
alert.showAndWait();
}

}
}

This file was deleted.

This file was deleted.

Loading