Merge pull request #59 from goxr3plus/Maven-Implementation

Adding Maven Nature Part 2
badarshahzad · Nov 19, 2017 · 43686e9 · 43686e9
2 parents beee226 + 8a54088
commit 43686e9
Show file tree

Hide file tree

Showing 44 changed files with 156 additions and 114 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,26 @@
-JFX-Browser
-===========
-A web browser written in java and love with javaFX front-end.The borwser is based on javaFx's webview.
 
-[Jfx Browser Gif](https://twitter.com/badarshahzad54/status/859596238202691584)
 
-[Jfx Browser Demo](https://youtu.be/DH_6g4OcfyE?list=PLv2dKKz-juPaCQsqET0BH4pUsJw8pbjxb)
+# JFX-Browser
+
+[![Latest Version](https://img.shields.io/github/release/badarshahzad/Jfx-Browser.svg?style=flat-square)](https://github.com/badarshahzad/Jfx-Browser/releases)
+[![GitHub contributors][contributors-image]][contributors-url]
+[![HitCount](http://hits.dwyl.io/badarshahzad/Jfx-Browser.svg)](http://hits.dwyl.io/badarshahzad/Jfx-Browser)
+[![Total Downloads](https://img.shields.io/github/downloads/badarshahzad/Jfx-Browser/total.svg)](https://github.com/badarshahzad/Jfx-Browser/releases)
+
+[contributors-url]: https://github.com/badarshahzad/Jfx-Browser/graphs/contributors
+[contributors-image]: https://img.shields.io/github/contributors/badarshahzad/Jfx-Browser.svg
+
+A web browser written in java and love with javaFX front-end.The browser is based on JavaFx's webview.
+
+### Youtube Demonstration
+[![First](http://img.youtube.com/vi/DH_6g4OcfyE/0.jpg)](https://www.youtube.com/watch?v=DH_6g4OcfyE)
+
+### Follow me on Twitter
+[Follow me on Twitter](https://twitter.com/badarshahzad54/status/859596238202691584)
+
+### Download and try it :)
+[JFX-Browser V1.0.0.zip](https://github.com/badarshahzad/Jfx-Browser/files/1485201/JFX-Browser.V1.0.0.zip)
+
 
 ### Features
 
@@ -15,12 +31,6 @@ A web browser written in java and love with javaFX front-end.The borwser is base
 + Convert HTML page into PDF with our **HTML to PDF converter** and save it to your local machine.
 + Keep your *secret* online accounts saved in **Passowrd Valut**.
 
-> ### Dependencies
->
-> JDK 1.8 or later.
-> javaFx library.
-> Internet Connection.
-
 ### Usage
 
 + Once you have all Dependencies.
@@ -30,22 +40,58 @@ A web browser written in java and love with javaFX front-end.The borwser is base
 + You may need to include the libraries in the lib folder into your class path.
 + Open the main package and run Main.java class *enjoy !*.
 
-### Documentations
-Link to Browser's Documentation [click here](#)
-
-> ### Credits
->
+### Important Information
+<details>
+  <summary> <b> Dependencies </b></summary>
+  <p>
+    1) JDK 1.8 or later. <br>
+    2) javaFx library.    <br>
+    3) Internet Connection.
+  </p>
+</details>
+<details>
+  <summary>License</summary>
+  <p>
+
+        The MIT License (MIT)
+
+        Copyright (c) 2015 Microsoft Corporation.
+
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+     
+  </p>
+</details>
+
+
+
+
+### Credits
+
 > + Badar Shahzad Khan [github.com](https://github.com/badarshahzad)
 > + Muhammad Shoib Khan [github.com](https://github.com/Shoaibkhan786)
 > + Naeem Rashid [github.com](https://github.com/naeemkhan12)
 > + Hassan Iqbal Khan [github.com](https://github.com/Hassankhan2015)
 > + Ramzan Shahid Khan [github.com](https://github.com/RamzanShahidkhan)
 > + SanaUllah Khan [github.com](https://github.com/sanaullahkhan1234)
+> + GOXR3PLUS Studio [github.com](https://github.com/goxr3plus)
 
 ### Contact Us
 
 + Badar Shahzad Khan [linkedin.com](https://www.linkedin.com/in/badarshahzad/)
 + Badar Shahzad Khan [twitter.com](https://twitter.com/badarshahzad54)
-
-### License
-Read the license.[click here](https://raw.githubusercontent.com/badarshahzad/Jfx-Browser/master/LICENSE)
diff --git a/SEGP/pom.xml b/SEGP/pom.xml
@@ -54,7 +54,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<mainClass>application.Main</mainClass>
+							<mainClass>main.java.com.github.jfxbrowser.application.Main</mainClass>
 							<classpathPrefix>JFX-Browser_lib/</classpathPrefix>
 						</manifest>
 					</archive>

diff --git a/SEGP/resources/fxml/Downloads.fxml b/SEGP/resources/fxml/Downloads.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<BorderPane fx:id="borderPane" prefHeight="450.0" prefWidth="650.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.DownloadController">
+<BorderPane fx:id="borderPane" prefHeight="450.0" prefWidth="650.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.com.github.jfxbrowser.controllers.DownloadController">
    <top>
       <GridPane opacity="0.84" style="-fx-background-color: #2959ea;" BorderPane.alignment="CENTER">
         <columnConstraints>

diff --git a/SEGP/resources/fxml/History.fxml b/SEGP/resources/fxml/History.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<BorderPane fx:id="borderPaneHistory" prefHeight="450.0" prefWidth="650.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.HistoryController">
+<BorderPane fx:id="borderPaneHistory" prefHeight="450.0" prefWidth="650.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.com.github.jfxbrowser.controllers.HistoryController">
    <left>
       <VBox fx:id="paneForChart" opacity="0.84" prefWidth="250.0" BorderPane.alignment="CENTER">
          <children>

diff --git a/SEGP/resources/fxml/Login.fxml b/SEGP/resources/fxml/Login.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.effect.DropShadow?>
 <?import javafx.scene.layout.Pane?>
 
-<Pane fx:id="loginPane" prefHeight="400.0" prefWidth="400.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.LoginController">
+<Pane fx:id="loginPane" prefHeight="400.0" prefWidth="400.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.com.github.jfxbrowser.controllers.LoginController">
    <children>
       <JFXTextField fx:id="user" focusColor="#3c7cea" labelFloat="true" layoutX="69.0" layoutY="87.0" minHeight="50.0" minWidth="250.0" opacity="0.7" promptText="User name" style="-fx-background-radius: 10;" />
       <JFXPasswordField fx:id="password" focusColor="#3c7cea" labelFloat="true" layoutX="69.0" layoutY="181.0" minHeight="50.0" minWidth="250.0" opacity="0.7" promptText="Password" style="-fx-background-radius: 10;" />

diff --git a/SEGP/resources/fxml/MainFXML.fxml b/SEGP/resources/fxml/MainFXML.fxml
@@ -3,4 +3,4 @@
 <?import javafx.scene.layout.BorderPane?>
 
 
-<BorderPane fx:id="rootBorderPane" minWidth="700.0" prefHeight="600.0" prefWidth="700.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.MainController" />
+<BorderPane fx:id="rootBorderPane" minWidth="700.0" prefHeight="600.0" prefWidth="700.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.com.github.jfxbrowser.controllers.MainController" />
diff --git a/SEGP/resources/fxml/ProxySet.fxml b/SEGP/resources/fxml/ProxySet.fxml
@@ -7,8 +7,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.text.Font?>
 
-
-<AnchorPane fx:id="proxyPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="276.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.ProxyController">
+<AnchorPane fx:id="proxyPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="276.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.com.github.jfxbrowser.controllers.ProxyController">
    <children>
       <Label layoutX="51.0" layoutY="16.0" prefHeight="45.0" prefWidth="325.0" text="Configure Proxies to Access the Internet">
          <font>

diff --git a/SEGP/resources/fxml/Setting.fxml b/SEGP/resources/fxml/Setting.fxml
@@ -16,8 +16,7 @@
 <?import javafx.scene.shape.Line?>
 <?import javafx.scene.text.Font?>
 
-
-<BorderPane style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.SettingController">
+<BorderPane style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.com.github.jfxbrowser.controllers.SettingController">
 
       <top>
       <GridPane opacity="0.84" style="-fx-background-color: #2959ea;" BorderPane.alignment="CENTER">

diff --git a/SEGP/resources/fxml/SignUp.fxml b/SEGP/resources/fxml/SignUp.fxml
@@ -5,7 +5,7 @@
 <?import com.jfoenix.controls.JFXTextField?>
 <?import javafx.scene.layout.Pane?>
 
-<Pane fx:id="signUpPane" minHeight="500.0" prefHeight="500.0" prefWidth="400.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.SignUpController">
+<Pane fx:id="signUpPane" minHeight="500.0" prefHeight="500.0" prefWidth="400.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.com.github.jfxbrowser.controllers.SignUpController">
    <children>
       <JFXTextField fx:id="firstname" labelFloat="true" layoutX="50.0" layoutY="55.0" minHeight="50.0" minWidth="300.0" opacity="0.7" promptText="First Name" style="-fx-background-radius: 10; -fx-focus-color: #03A9F4;" />
       <JFXTextField fx:id="email" labelFloat="true" layoutX="50.0" layoutY="144.0" minHeight="50.0" minWidth="300.0" opacity="0.7" promptText="Email Address" style="-fx-background-radius: 10; -fx-focus-color: #03A9F4;" />

diff --git a/SEGP/resources/fxml/Tab.fxml b/SEGP/resources/fxml/Tab.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<BorderPane fx:id="borderpane" minHeight="600.0" minWidth="700.0" prefHeight="600.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.TabController">
+<BorderPane fx:id="borderpane" minHeight="600.0" minWidth="700.0" prefHeight="600.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.com.github.jfxbrowser.controllers.TabController">
    <top>
       <GridPane minWidth="700.0" prefWidth="700.0" BorderPane.alignment="CENTER">
          <columnConstraints>

diff --git a/SEGP/src/application/Main.java → ...m/github/jfxbrowser/application/Main.java b/SEGP/src/application/Main.java → ...m/github/jfxbrowser/application/Main.java
@@ -1,4 +1,4 @@
-package application;
+package main.java.com.github.jfxbrowser.application;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -10,13 +10,6 @@
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
 
-import controllers.MainController;
-import controllers.TabController;
-import database.BookMarksDataBase;
-import database.CRUD;
-import database.DownloadDatabase;
-import database.HistoryManagment;
-import database.UserAccounts;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
@@ -28,6 +21,13 @@
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.util.Duration;
+import main.java.com.github.jfxbrowser.controllers.MainController;
+import main.java.com.github.jfxbrowser.controllers.TabController;
+import main.java.com.github.jfxbrowser.database.BookMarksDataBase;
+import main.java.com.github.jfxbrowser.database.CRUD;
+import main.java.com.github.jfxbrowser.database.DownloadDatabase;
+import main.java.com.github.jfxbrowser.database.HistoryManagment;
+import main.java.com.github.jfxbrowser.database.UserAccounts;
 
 /**
  *

diff --git a/SEGP/src/application/Renderer.java → ...thub/jfxbrowser/application/Renderer.java b/SEGP/src/application/Renderer.java → ...thub/jfxbrowser/application/Renderer.java
@@ -1,4 +1,4 @@
-package application;
+package main.java.com.github.jfxbrowser.application;
 
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;

diff --git a/SEGP/src/bookmarks/BookMarks.java → ...ithub/jfxbrowser/bookmarks/BookMarks.java b/SEGP/src/bookmarks/BookMarks.java → ...ithub/jfxbrowser/bookmarks/BookMarks.java
@@ -1,10 +1,8 @@
-package bookmarks;
+package main.java.com.github.jfxbrowser.bookmarks;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXTextField;
 
-import application.Main;
-import database.BookMarksDataBase;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -22,6 +20,8 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.util.Callback;
+import main.java.com.github.jfxbrowser.application.Main;
+import main.java.com.github.jfxbrowser.database.BookMarksDataBase;
 
 public class BookMarks {
 
@@ -34,7 +34,7 @@ public class BookMarks {
 	private TableView<URLdetails> table = new TableView<>();
 
 	public static ObservableList<URLdetails> list = FXCollections.observableArrayList();
-	private Image folderImage = new Image(getClass().getResourceAsStream(Main.FXMLS+"folder.png"));
+	private Image folderImage = new Image(getClass().getResourceAsStream(Main.IMAGES+"folder.png"));
 	private TreeTableView<String> treeView  = new TreeTableView<>();
 	private TreeTableColumn<String, String> bookMarkCol = new TreeTableColumn<>("BookMarks");
 	TreeItem parentFolder = new TreeItem<>("All Bookmarks");

diff --git a/SEGP/src/bookmarks/PopulateTable.java → ...b/jfxbrowser/bookmarks/PopulateTable.java b/SEGP/src/bookmarks/PopulateTable.java → ...b/jfxbrowser/bookmarks/PopulateTable.java
@@ -1,12 +1,12 @@
-package bookmarks;
+package main.java.com.github.jfxbrowser.bookmarks;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 
-import database.BookMarksDataBase;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import main.java.com.github.jfxbrowser.database.BookMarksDataBase;
 
 public class PopulateTable {
 	private ObservableList<URLdetails> list = FXCollections.observableArrayList();

diff --git a/SEGP/src/bookmarks/URLdetails.java → ...thub/jfxbrowser/bookmarks/URLdetails.java b/SEGP/src/bookmarks/URLdetails.java → ...thub/jfxbrowser/bookmarks/URLdetails.java
@@ -1,4 +1,4 @@
-package bookmarks;
+package main.java.com.github.jfxbrowser.bookmarks;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;

diff --git a/SEGP/src/controllers/DownloadController.java → ...owser/controllers/DownloadController.java b/SEGP/src/controllers/DownloadController.java → ...owser/controllers/DownloadController.java
@@ -1,4 +1,4 @@
-package controllers;
+package main.java.com.github.jfxbrowser.controllers;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -9,9 +9,6 @@
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXTextField;
 
-import database.DownloadDatabase;
-import database.SqliteConnection;
-import downloader.download;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -21,6 +18,9 @@
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
+import main.java.com.github.jfxbrowser.database.DownloadDatabase;
+import main.java.com.github.jfxbrowser.database.SqliteConnection;
+import main.java.com.github.jfxbrowser.downloader.download;
 
 public class DownloadController   implements Initializable{
 

diff --git a/SEGP/src/controllers/HistoryController.java → ...rowser/controllers/HistoryController.java b/SEGP/src/controllers/HistoryController.java → ...rowser/controllers/HistoryController.java
@@ -1,4 +1,4 @@
-package controllers;
+package main.java.com.github.jfxbrowser.controllers;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -15,9 +15,6 @@
 import com.jfoenix.controls.RecursiveTreeItem;
 import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
 
-import application.Main;
-import database.HistoryManagment;
-import database.SqliteConnection;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ObservableValue;
@@ -43,7 +40,10 @@
 import javafx.scene.text.Text;
 import javafx.util.Callback;
 import javafx.util.Duration;
-import userInterface.HistoryTree;
+import main.java.com.github.jfxbrowser.application.Main;
+import main.java.com.github.jfxbrowser.database.HistoryManagment;
+import main.java.com.github.jfxbrowser.database.SqliteConnection;
+import main.java.com.github.jfxbrowser.userInterface.HistoryTree;
 
 public class HistoryController implements Initializable {
 

diff --git a/SEGP/src/controllers/LoginController.java → ...xbrowser/controllers/LoginController.java b/SEGP/src/controllers/LoginController.java → ...xbrowser/controllers/LoginController.java
@@ -1,4 +1,4 @@
-package controllers;
+package main.java.com.github.jfxbrowser.controllers;
 
 import java.net.URL;
 import java.rmi.server.LoaderHandler;
@@ -11,9 +11,6 @@
 import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXTextField;
 
-import application.Main;
-import database.CRUD;
-import database.SqliteConnection;
 import javafx.application.Application;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -25,6 +22,9 @@
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 import javafx.util.Duration;
+import main.java.com.github.jfxbrowser.application.Main;
+import main.java.com.github.jfxbrowser.database.CRUD;
+import main.java.com.github.jfxbrowser.database.SqliteConnection;
 
 /**
  *

diff --git a/SEGP/src/controllers/MainController.java → ...fxbrowser/controllers/MainController.java b/SEGP/src/controllers/MainController.java → ...fxbrowser/controllers/MainController.java
@@ -3,13 +3,12 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package controllers;
+package main.java.com.github.jfxbrowser.controllers;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 
-import application.Main;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -26,7 +25,8 @@
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.web.WebEngine;
-import userInterface.Hamburger;
+import main.java.com.github.jfxbrowser.application.Main;
+import main.java.com.github.jfxbrowser.userInterface.Hamburger;
 
 /**
  *

diff --git a/SEGP/src/controllers/ProxyController.java → ...xbrowser/controllers/ProxyController.java b/SEGP/src/controllers/ProxyController.java → ...xbrowser/controllers/ProxyController.java
@@ -1,4 +1,4 @@
-package controllers;
+package main.java.com.github.jfxbrowser.controllers;
 
 import java.net.URL;
 import java.util.Properties;