Revert "Karan develop"

airavata-courses · Sep 18, 2018 · 308f626 · 308f626
1 parent 78677d6
commit 308f626
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 259 deletions.
diff --git a/screenshots/Jenkins_Test_Develop_Branch.PNG b/screenshots/Jenkins_Test_Develop_Branch.PNG
diff --git a/src/main/java/org/seagrid/desktop/ui/home/controller/HomeController.java b/src/main/java/org/seagrid/desktop/ui/home/controller/HomeController.java
@@ -68,7 +68,6 @@
 import org.seagrid.desktop.ui.home.model.ExperimentListModel;
 import org.seagrid.desktop.ui.home.model.ProjectTreeModel;
 import org.seagrid.desktop.ui.home.model.TreeModel;
-import org.seagrid.desktop.ui.prestageupload.PrestageUploadWindow;
 import org.seagrid.desktop.ui.project.ProjectWindow;
 import org.seagrid.desktop.ui.storage.MassStorageBrowserWindow;
 import org.seagrid.desktop.util.SEAGridConfig;
@@ -113,9 +112,6 @@ public class HomeController {
     @FXML
     private Button createExperimentButton;
 
-    @FXML
-    private Button uploadInputFilesButton;
-
     @FXML
     private TreeView<TreeModel> projectsTreeView;
 
@@ -222,7 +218,7 @@ public void initialize() {
         notificationLabel.setStyle("-fx-border-color: white;");
         notificationLabel.setMaxWidth(Double.MAX_VALUE);
         try{
-            List<Notification> messages = AiravataManager.getInstance().getNotifications();
+            java.util.List<Notification> messages = AiravataManager.getInstance().getNotifications();
             final Index index = new Index();
             index.index = 0;
             if (messages != null && messages.size() > 0) {
@@ -299,13 +295,6 @@ public void initMenuBar() {
                         "Failed to open Storage Browser");
             }
         });
-        uploadInputFilesButton.setOnMouseClicked(event -> {
-            try {
-                PrestageUploadWindow.displayUploadFiles();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
         nanocadBtn.setOnAction(event ->
                 SwingUtilities.invokeLater(new Runnable() {
                     @Override

diff --git a/src/main/java/org/seagrid/desktop/ui/prestageupload/PrestageUploadWindow.java b/src/main/java/org/seagrid/desktop/ui/prestageupload/PrestageUploadWindow.java
diff --git a/src/main/java/org/seagrid/desktop/ui/prestageupload/controller/PrestageUploadController.java b/src/main/java/org/seagrid/desktop/ui/prestageupload/controller/PrestageUploadController.java
diff --git a/src/main/resources/views/home/home.fxml b/src/main/resources/views/home/home.fxml
@@ -156,11 +156,6 @@
               </HBox.margin>
             </Button>
             <Button fx:id="browseMassStorageBtn" mnemonicParsing="false" text="Storage" HBox.margin="$x5" />
-            <Button fx:id="uploadInputFilesButton" mnemonicParsing="false" text="Upload Input Files">
-              <HBox.margin>
-                <Insets bottom="3.0" right="3.0" top="3.0" fx:id="x5" />
-              </HBox.margin>
-            </Button>
             <Button id="browseMassStorageBtn" fx:id="nanocadBtn" mnemonicParsing="false" text="Nanocad" visible="false" HBox.margin="$x5" />
             <Button id="browseMassStorageBtn" fx:id="jamberooBtn" mnemonicParsing="false" text="Jamberoo" visible="false">
               <HBox.margin>

diff --git a/src/main/resources/views/prestageupload/upload-files.fxml b/src/main/resources/views/prestageupload/upload-files.fxml