Browse Source

Made the project exportable into a jar

Jan Enders 8 years ago
parent
commit
6859f62a5c
31 changed files with 44 additions and 19 deletions
  1. 4 4
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/GUITheme.css
  2. 5 1
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/MainApp.java
  3. 1 1
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/MainWindow.fxml
  4. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/test.png
  5. 30 11
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/ToolboxManager.java
  6. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/dirEdge.png
  7. 4 2
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/MapViewFunctions.java
  8. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/3G_lte_basestation.png
  9. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/car.png
  10. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/cloud_computing_server.png
  11. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/data_storage.png
  12. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/desktop.png
  13. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/laptop.png
  14. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/network_middlebox.png
  15. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/not_found.png
  16. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/raspberry_pi.png
  17. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/router.png
  18. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/sensor.png
  19. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/smart_home.png
  20. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/smartband.png
  21. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/smartphone.png
  22. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/smartwatch.png
  23. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/switch.png
  24. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/tablet.png
  25. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/unknown.png
  26. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/procEn.png
  27. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/sink.png
  28. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/source.png
  29. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/standard_operator.png
  30. 0 0
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/undirEdge.png
  31. BIN
      scopviz/src/main/resources/png/Thumbs.db

+ 4 - 4
scopviz/src/main/resources/GUITheme.css → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/GUITheme.css

@@ -1,23 +1,23 @@
 .underlayButton{
-	-fx-background-image: url('test.png');
+	-fx-background-image: url('/de/tu_darmstadt/informatik/tk/scopviz/main/test.png');
   -fx-background-repeat: no-repeat;
   -fx-background-position: center
 }
 
 .operatorButton{
-	-fx-background-image: url('test.png');
+	-fx-background-image: url('/de/tu_darmstadt/informatik/tk/scopviz/main/test.png');
   -fx-background-repeat: no-repeat;
   -fx-background-position: center
 }
 
 .mappingButton{
-	-fx-background-image: url('test.png');
+	-fx-background-image: url('/de/tu_darmstadt/informatik/tk/scopviz/main/test.png');
   -fx-background-repeat: no-repeat;
   -fx-background-position: center
 }
 
 .symbolRepButton{
-	-fx-background-image: url('test.png');
+	-fx-background-image: url('/de/tu_darmstadt/informatik/tk/scopviz/main/test.png');
   -fx-background-repeat: no-repeat;
   -fx-background-position: center
 }

+ 5 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/MainApp.java

@@ -1,6 +1,7 @@
 package de.tu_darmstadt.informatik.tk.scopviz.main;
 
 import java.io.IOException;
+import java.net.URL;
 
 import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
 import de.tu_darmstadt.informatik.tk.scopviz.io.GraphMLExporter;
@@ -85,7 +86,8 @@ public class MainApp extends Application {
 		// Load root layout from fxml file.
 		try {
 			FXMLLoader loader = new FXMLLoader();
-			loader.setLocation(MainApp.class.getResource("/MainWindow.fxml"));
+			URL test = MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/main/MainWindow.fxml");
+			loader.setLocation(test);
 			rootLayout = (VBox) loader.load();
 		} catch (IOException e) {
 			System.err.println("FXML File could not be loaded. Could the Path be incorrect?");
@@ -107,6 +109,8 @@ public class MainApp extends Application {
 
 		// Show the scene containing the root layout.
 		Scene scene = new Scene(rootLayout);
+		scene.getStylesheets().add(
+				MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/main/GUITheme.css").toExternalForm());
 		primaryStage.setMinHeight(400);
 		primaryStage.setMinWidth(640);
 		primaryStage.setScene(scene);

+ 1 - 1
scopviz/src/main/resources/MainWindow.fxml → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/MainWindow.fxml

@@ -20,7 +20,7 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
 
-<VBox minHeight="768.0" minWidth="1024.0" prefHeight="768.0" prefWidth="1024.0" stylesheets="@GUITheme.css" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.tu_darmstadt.informatik.tk.scopviz.ui.GUIController">
+<VBox minHeight="768.0" minWidth="1024.0" prefHeight="768.0" prefWidth="1024.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.tu_darmstadt.informatik.tk.scopviz.ui.GUIController">
   <children>
     <MenuBar VBox.vgrow="NEVER">
       <menus>

+ 0 - 0
scopviz/src/main/resources/test.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/test.png


+ 30 - 11
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/ToolboxManager.java

@@ -66,11 +66,20 @@ public final class ToolboxManager {
 
 		@SuppressWarnings("unchecked")
 		ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(
-				pair(new Image(MainApp.class.getResource("/png/standard_operator.png").toString()), "Standard"),
-				pair(new Image(MainApp.class.getResource("/png/procEn.png").toString()), "ProcEn"),
-				pair(new Image(MainApp.class.getResource("/png/source.png").toString()), "Source"),
-				pair(new Image(MainApp.class.getResource("/png/sink.png").toString()), "Sink"),
-				pair(new Image(MainApp.class.getResource("/png/undirEdge.png").toString()), "Undirected"));
+				pair(new Image(MainApp.class
+						.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/standard_operator.png").toString()),
+						"Standard"),
+				pair(new Image(
+						MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/procEn.png").toString()),
+						"ProcEn"),
+				pair(new Image(
+						MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/source.png").toString()),
+						"Source"),
+				pair(new Image(
+						MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/sink.png").toString()),
+						"Sink"),
+				pair(new Image(MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/undirEdge.png")
+						.toString()), "Undirected"));
 
 		controller.toolbox.getItems().setAll(data);
 	}
@@ -82,10 +91,18 @@ public final class ToolboxManager {
 
 		@SuppressWarnings("unchecked")
 		ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(
-				pair(new Image(MainApp.class.getResource("/png/standard_operator.png").toString()), "Operator"),
-				pair(new Image(MainApp.class.getResource("/png/source.png").toString()), "Source"),
-				pair(new Image(MainApp.class.getResource("/png/sink.png").toString()), "Sink"),
-				pair(new Image(MainApp.class.getResource("/png/dirEdge.png").toString()), "Directed"));
+				pair(new Image(MainApp.class
+						.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/standard_operator.png").toString()),
+						"Operator"),
+				pair(new Image(
+						MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/source.png").toString()),
+						"Source"),
+				pair(new Image(
+						MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/sink.png").toString()),
+						"Sink"),
+				pair(new Image(
+						MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/dirEdge.png").toString()),
+						"Directed"));
 
 		controller.toolbox.getItems().setAll(data);
 
@@ -97,8 +114,10 @@ public final class ToolboxManager {
 	public static void setMappingItems() {
 
 		@SuppressWarnings("unchecked")
-		ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(
-				pair(new Image(MainApp.class.getResource("/png/dirEdge.png").toString()), "Mapping Edge"));
+		ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(pair(
+				new Image(
+						MainApp.class.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/dirEdge.png").toString()),
+				"Mapping Edge"));
 
 		controller.toolbox.getItems().setAll(data);
 

+ 0 - 0
scopviz/src/main/resources/png/dirEdge.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/dirEdge.png


+ 4 - 2
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/MapViewFunctions.java

@@ -194,10 +194,12 @@ public final class MapViewFunctions {
 	 */
 	public static URL getDeviceTypeURL(String deviceType) {
 
-		URL image = MainApp.class.getResource("/png/symbol_icons/" + deviceType + ".png");
+		URL image = MainApp.class
+				.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/" + deviceType + ".png");
 
 		if (image == null) {
-			return MainApp.class.getResource("/png/symbol_icons/not_found.png");
+			return MainApp.class
+					.getResource("/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/not_found.png");
 		}
 
 		else {

+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/3G_lte_basestation.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/3G_lte_basestation.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/car.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/car.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/cloud_computing_server.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/cloud_computing_server.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/data_storage.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/data_storage.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/desktop.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/desktop.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/laptop.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/laptop.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/network_middlebox.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/network_middlebox.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/not_found.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/not_found.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/raspberry_pi.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/raspberry_pi.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/router.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/router.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/sensor.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/sensor.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/smart_home.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/smart_home.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/smartband.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/smartband.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/smartphone.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/smartphone.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/smartwatch.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/smartwatch.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/switch.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/switch.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/tablet.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/tablet.png


+ 0 - 0
scopviz/src/main/resources/png/symbol_icons/unknown.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/symbol_icons/unknown.png


+ 0 - 0
scopviz/src/main/resources/png/procEn.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/procEn.png


+ 0 - 0
scopviz/src/main/resources/png/sink.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/sink.png


+ 0 - 0
scopviz/src/main/resources/png/source.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/source.png


+ 0 - 0
scopviz/src/main/resources/png/standard_operator.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/standard_operator.png


+ 0 - 0
scopviz/src/main/resources/png/undirEdge.png → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/undirEdge.png


BIN
scopviz/src/main/resources/png/Thumbs.db