NedRedmond 6 лет назад
Родитель
Сommit
8ecdb20699

+ 4
- 25
pom.xml Просмотреть файл

@@ -1,3 +1,4 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
1 2
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2 3
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 4
     <modelVersion>4.0.0</modelVersion>
@@ -31,35 +32,13 @@
31 32
     <build>
32 33
         <plugins>
33 34
             <plugin>
35
+                <groupId>org.apache.maven.plugins</groupId>
34 36
                 <artifactId>maven-compiler-plugin</artifactId>
35
-                <version>${maven.compiler.version}</version>
36 37
                 <configuration>
37
-                    <source>${source.version}</source>
38
-                    <target>${source.version}</target>
38
+                    <source>8</source>
39
+                    <target>8</target>
39 40
                 </configuration>
40 41
             </plugin>
41
-
42
-            <plugin>
43
-                <groupId>org.apache.maven.plugins</groupId>
44
-                <artifactId>maven-shade-plugin</artifactId>
45
-                <version>${maven.shade.version}</version>
46
-                <executions>
47
-                    <execution>
48
-                        <phase>package</phase>
49
-                        <goals>
50
-                            <goal>shade</goal>
51
-                        </goals>
52
-                        <configuration>
53
-                            <transformers>
54
-                                <transformer
55
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
56
-                                    <mainClass>com.almasb.atm.CashMachineApp</mainClass>
57
-                                </transformer>
58
-                            </transformers>
59
-                        </configuration>
60
-                    </execution>
61
-                </executions>
62
-            </plugin>
63 42
         </plugins>
64 43
     </build>
65 44
 

src/main/java/rocks/zipcode/atm/AccountController.java → src/main/java/AccountController.java Просмотреть файл

@@ -1,5 +1,3 @@
1
-package rocks.zipcode.atm;
2
-
3 1
 import com.jfoenix.controls.JFXButton;
4 2
 import com.jfoenix.controls.JFXTabPane;
5 3
 import com.jfoenix.controls.JFXTextArea;
@@ -7,6 +5,7 @@ import javafx.event.Event;
7 5
 import javafx.fxml.FXML;
8 6
 import javafx.scene.control.Tab;
9 7
 import javafx.scene.control.TextField;
8
+import rocks.zipcode.atm.CashMachine;
10 9
 
11 10
 import java.util.concurrent.TimeUnit;
12 11
 

src/main/java/rocks/zipcode/atm/LoginController.java → src/main/java/LoginController.java Просмотреть файл

@@ -1,9 +1,8 @@
1
-package rocks.zipcode.atm;
2
-
3 1
 import com.jfoenix.controls.JFXPasswordField;
4 2
 import com.jfoenix.controls.JFXTextField;
5 3
 import javafx.event.ActionEvent;
6 4
 import javafx.fxml.FXML;
5
+import rocks.zipcode.atm.CashMachine;
7 6
 
8 7
 /**
9 8
  * Controller class for the first vista.

src/main/java/rocks/zipcode/atm/Main.java → src/main/java/Main.java Просмотреть файл

@@ -1,5 +1,3 @@
1
-package rocks.zipcode.atm;
2
-
3 1
 import javafx.application.Application;
4 2
 import javafx.fxml.FXMLLoader;
5 3
 import javafx.scene.Scene;
@@ -9,13 +7,13 @@ import javafx.stage.Stage;
9 7
 import java.io.IOException;
10 8
 
11 9
 /**
12
- * rocks.zipcode.atm.Main application class.
10
+ * Main application class.
13 11
  */
14 12
 public class Main extends Application {
15 13
 
16 14
     @Override
17 15
     public void start(Stage stage) throws Exception{
18
-        stage.setTitle("Vista Viewer");
16
+        stage.setTitle("Zip Cloud Bank");
19 17
 
20 18
         stage.setScene(
21 19
             createScene(
@@ -28,7 +26,7 @@ public class Main extends Application {
28 26
 
29 27
     /**
30 28
      * Loads the main fxml layout.
31
-     * Sets up the vista switching rocks.zipcode.atm.SceneSwitcher.
29
+     * Sets up the vista switching SceneSwitcher.
32 30
      * Loads the first vista into the fxml layout.
33 31
      *
34 32
      * @return the loaded pane.

src/main/java/rocks/zipcode/atm/MainController.java → src/main/java/MainController.java Просмотреть файл

@@ -1,11 +1,9 @@
1
-package rocks.zipcode.atm;
2
-
3 1
 import javafx.fxml.FXML;
4 2
 import javafx.scene.Node;
5 3
 import javafx.scene.layout.StackPane;
6 4
 
7 5
 /**
8
- * rocks.zipcode.atm.Main controller class for the entire layout.
6
+ * Main controller class for the entire layout.
9 7
  */
10 8
 public class MainController {
11 9
 

src/main/java/rocks/zipcode/atm/SceneSwitcher.java → src/main/java/SceneSwitcher.java Просмотреть файл

@@ -1,5 +1,3 @@
1
-package rocks.zipcode.atm;
2
-
3 1
 import javafx.fxml.FXMLLoader;
4 2
 import javafx.scene.Node;
5 3
 

+ 2
- 2
src/main/resources/accountview.fxml Просмотреть файл

@@ -12,13 +12,13 @@
12 12
 
13 13
 <?import javafx.scene.text.Font?>
14 14
 
15
-<!--<StackPane fx:id="vista2" xmlns:fx="http://javafx.com/fxml" fx:controller="rocks.zipcode.atm.AccountController">-->
15
+<!--<StackPane fx:id="vista2" xmlns:fx="http://javafx.com/fxml" fx:controller="AccountController">-->
16 16
 <!--<children>-->
17 17
 <!--<Button mnemonicParsing="false" onAction="#previousPane" text="Previous Pane" />-->
18 18
 <!--</children>-->
19 19
 <!--</StackPane>-->
20 20
 
21
-<VBox fx:id="vista2" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="rocks.zipcode.atm.AccountController">
21
+<VBox fx:id="vista2" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="AccountController">
22 22
   <children>
23 23
     <JFXTabPane fx:id="tabPane" prefHeight="60.0" prefWidth="466.0">
24 24
       <tabs>

+ 1
- 1
src/main/resources/login.fxml Просмотреть файл

@@ -11,7 +11,7 @@
11 11
 
12 12
 <?import javafx.scene.text.Font?>
13 13
 
14
-<VBox fx:id="vista1" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="rocks.zipcode.atm.LoginController">
14
+<VBox fx:id="vista1" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="LoginController">
15 15
   <!--<children>-->
16 16
     <!--<Button mnemonicParsing="false" onAction="#nextPane" text="Next Pane" />-->
17 17
   <!--</children>-->

+ 2
- 2
src/main/resources/window.fxml Просмотреть файл

@@ -4,8 +4,8 @@
4 4
 <?import javafx.scene.layout.*?>
5 5
 <?scenebuilder-stylesheet vista.css?>
6 6
 
7
-<!--<VBox prefHeight="200.0" prefWidth="300.0" xmlns:fx="http://javafx.com/fxml" fx:controller="rocks.zipcode.atm.MainController">-->
8
-<VBox prefHeight="400.0" prefWidth="450.0" style="-fx-border-color: coral; -fx-border-width: 12; -fx-border-radius: 1; -fx-border-insets: 5;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml" fx:controller="rocks.zipcode.atm.MainController">
7
+<!--<VBox prefHeight="200.0" prefWidth="300.0" xmlns:fx="http://javafx.com/fxml" fx:controller="MainController">-->
8
+<VBox prefHeight="400.0" prefWidth="450.0" style="-fx-border-color: coral; -fx-border-width: 12; -fx-border-radius: 1; -fx-border-insets: 5;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml" fx:controller="MainController">
9 9
   <children>
10 10
     <!--<Label fx:id="headerLabel" maxWidth="1.7976931348623157E308" text="Header" VBox.vgrow="NEVER" />-->
11 11
     <StackPane fx:id="vistaHolder" VBox.vgrow="ALWAYS" />