Merge branch 'release'

vatbub · Jun 21, 2016 · 51dfcf9 · 51dfcf9
2 parents 5ac216b + ce00e64
commit 51dfcf9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fokprojects</groupId>
 	<artifactId>hangmanSolver</artifactId>
-	<version>0.0.3-SNAPSHOT</version>
+	<version>0.0.5-SNAPSHOT</version>
 	<name>Hangman Solver</name>
 	<description>An application that sloves Hangman</description>
 
@@ -117,6 +117,16 @@
 									<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
 								</manifest>
 							</archive>
+							<resources>
+								<resource>
+									<directory>src/main/java</directory>
+									<includes>
+										<include>**/.*tab</include>
+										<include>**/*.fxml</include>
+										<include>**/*.properties</include>
+									</includes>
+								</resource>
+							</resources>
 							<descriptorRefs>
 								<descriptorRef>jar-with-dependencies</descriptorRef>
 							</descriptorRefs>

diff --git a/src/main/java/algorithm/HangmanSolver.java b/src/main/java/algorithm/HangmanSolver.java
@@ -9,7 +9,7 @@
 
 public class HangmanSolver {
 
-	private static Language langOld;
+	private static Language langOld; 
 	private static TabFile wiktDatabase;
 	private static TabFile cldrDatabase;
 

diff --git a/src/main/java/view/MainWindow.fxml b/src/main/java/view/MainWindow.fxml
@@ -37,18 +37,17 @@
     <TextArea fx:id="proposedSolutions" editable="false" prefHeight="55.0" prefWidth="572.0" wrapText="true" AnchorPane.bottomAnchor="34.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="443.0" />
     <HBox prefHeight="25.0" prefWidth="598.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="5.0">
       <children>
-        <Label text="%version.label">
+        <Label prefHeight="28.0" text="%version.label" HBox.hgrow="ALWAYS">
           <HBox.margin>
             <Insets left="14.0" />
           </HBox.margin>
         </Label>
-        <Label fx:id="versionLabel" text="unknown">
+        <Label fx:id="versionLabel" alignment="CENTER_LEFT" prefHeight="28.0" text="unknown" HBox.hgrow="ALWAYS">
           <HBox.margin>
             <Insets left="5.0" />
           </HBox.margin>
         </Label>
-        <Pane prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
-        <Hyperlink fx:id="updateLink" onAction="#updateLinkOnAction" text="%updateLink" textFill="#0066ff">
+        <Hyperlink fx:id="updateLink" minHeight="-1.0" onAction="#updateLinkOnAction" prefHeight="-1.0" text="%updateLink" textFill="#0066ff" HBox.hgrow="ALWAYS">
           <HBox.margin>
             <Insets right="14.0" />
           </HBox.margin>