diff --git a/README.md b/README.md index 2000622..f75f172 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ -# Satyam Consignment +# OpenConsignment -Satyam Consignment is a JavaFX based Desktop GUI application for managing consignment data. \ No newline at end of file +Logo + +OpenConsignment is a JavaFX based Desktop GUI application for managing consignment data. \ No newline at end of file diff --git a/assets/opaque_logo.png b/assets/opaque_logo.png new file mode 100644 index 0000000..87035b1 Binary files /dev/null and b/assets/opaque_logo.png differ diff --git a/assets/transparent_logo.png b/assets/transparent_logo.png new file mode 100644 index 0000000..b104519 Binary files /dev/null and b/assets/transparent_logo.png differ diff --git a/build.gradle.kts b/build.gradle.kts index 33d8448..d271071 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,9 +27,6 @@ dependencies { compileOnly(libs.lombok) annotationProcessor(libs.lombok) - testCompileOnly(libs.lombok) - testAnnotationProcessor(libs.lombok) - testImplementation(libs.testfx.junit5) testImplementation(libs.testfx.monocle) testImplementation(libs.hamcrest) @@ -73,7 +70,7 @@ spotless { } application { - mainClass.set("satyamconsignment.Launcher") + mainClass.set("openconsignment.Launcher") } tasks.named("run") { diff --git a/scripts/start.bat b/scripts/start.bat index 121077b..84cfd34 100644 --- a/scripts/start.bat +++ b/scripts/start.bat @@ -11,6 +11,6 @@ java --module-path "%JAVAFX_MODULE_PATH%" ^ --add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED ^ --add-exports=javafx.base/com.sun.javafx.binding=ALL-UNNAMED ^ --add-exports=javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED ^ --jar SatyamConsignment.jar +-jar OpenConsignment.jar pause \ No newline at end of file diff --git a/scripts/start.sh b/scripts/start.sh index eee19f0..d80051b 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -11,4 +11,4 @@ java --module-path "$JAVAFX_MODULE_PATH" \ --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED \ --add-exports javafx.base/com.sun.javafx.binding=ALL-UNNAMED \ --add-exports javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED \ - -jar SatyamConsignment.jar + -jar OpenConsignment.jar diff --git a/settings.gradle.kts b/settings.gradle.kts index 0fe0372..8133b10 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "SatyamConsignment" +rootProject.name = "OpenConsignment" pluginManagement { repositories { diff --git a/src/main/java/satyamconsignment/Launcher.java b/src/main/java/openconsignment/Launcher.java similarity index 89% rename from src/main/java/satyamconsignment/Launcher.java rename to src/main/java/openconsignment/Launcher.java index 7667ca4..fd6f2dc 100644 --- a/src/main/java/satyamconsignment/Launcher.java +++ b/src/main/java/openconsignment/Launcher.java @@ -1,4 +1,4 @@ -package satyamconsignment; +package openconsignment; import java.io.InputStream; import java.net.URL; @@ -10,7 +10,7 @@ import javafx.scene.Scene; import javafx.scene.image.Image; import javafx.stage.Stage; -import satyamconsignment.common.Utils; +import openconsignment.common.Utils; public class Launcher extends Application { @@ -31,11 +31,11 @@ public void start(Stage stage) { stage.setScene(scene); stage.setMaximized(true); stage.show(); - InputStream resourceAsStream = getClass().getResourceAsStream("/icons/Icon.png"); + InputStream resourceAsStream = getClass().getResourceAsStream("/icons/opaque_logo.png"); if (resourceAsStream != null) { stage.getIcons().add(new Image(resourceAsStream)); } - stage.setTitle("Satyam Consignment"); + stage.setTitle("OpenConsignment"); } catch (Exception ex) { Utils.showAlert(ex.toString()); Logger.getLogger(Launcher.class.getName()).log(Level.SEVERE, ex.toString(), ex); diff --git a/src/main/java/satyamconsignment/common/Constants.java b/src/main/java/openconsignment/common/Constants.java similarity index 86% rename from src/main/java/satyamconsignment/common/Constants.java rename to src/main/java/openconsignment/common/Constants.java index 606728e..759b3e7 100644 --- a/src/main/java/satyamconsignment/common/Constants.java +++ b/src/main/java/openconsignment/common/Constants.java @@ -1,4 +1,4 @@ -package satyamconsignment.common; +package openconsignment.common; public class Constants { public static final String REPORT_FILE_NAME = "report.pdf"; diff --git a/src/main/java/satyamconsignment/common/DatabaseHandler.java b/src/main/java/openconsignment/common/DatabaseHandler.java similarity index 98% rename from src/main/java/satyamconsignment/common/DatabaseHandler.java rename to src/main/java/openconsignment/common/DatabaseHandler.java index 7113573..b900594 100644 --- a/src/main/java/satyamconsignment/common/DatabaseHandler.java +++ b/src/main/java/openconsignment/common/DatabaseHandler.java @@ -1,4 +1,4 @@ -package satyamconsignment.common; +package openconsignment.common; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/satyamconsignment/common/Utils.java b/src/main/java/openconsignment/common/Utils.java similarity index 99% rename from src/main/java/satyamconsignment/common/Utils.java rename to src/main/java/openconsignment/common/Utils.java index e2215ef..7f0b283 100644 --- a/src/main/java/satyamconsignment/common/Utils.java +++ b/src/main/java/openconsignment/common/Utils.java @@ -1,4 +1,4 @@ -package satyamconsignment.common; +package openconsignment.common; import java.awt.*; import java.io.File; diff --git a/src/main/java/satyamconsignment/common/ViewLoader.java b/src/main/java/openconsignment/common/ViewLoader.java similarity index 88% rename from src/main/java/satyamconsignment/common/ViewLoader.java rename to src/main/java/openconsignment/common/ViewLoader.java index 49aff31..2b6e131 100644 --- a/src/main/java/satyamconsignment/common/ViewLoader.java +++ b/src/main/java/openconsignment/common/ViewLoader.java @@ -1,4 +1,4 @@ -package satyamconsignment.common; +package openconsignment.common; import java.io.IOException; import java.util.Objects; @@ -8,8 +8,8 @@ import javafx.scene.Group; import javafx.scene.Parent; import javafx.scene.layout.BorderPane; -import satyamconsignment.controller.MainController; -import satyamconsignment.controller.entry.EntryController; +import openconsignment.controller.MainController; +import openconsignment.controller.entry.EntryController; public class ViewLoader { public void loadRoot(String resourcePath, Group root) { diff --git a/src/main/java/satyamconsignment/controller/MainController.java b/src/main/java/openconsignment/controller/MainController.java similarity index 95% rename from src/main/java/satyamconsignment/controller/MainController.java rename to src/main/java/openconsignment/controller/MainController.java index 02cb8ee..38ab651 100644 --- a/src/main/java/satyamconsignment/controller/MainController.java +++ b/src/main/java/openconsignment/controller/MainController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller; +package openconsignment.controller; import java.net.URL; import java.util.ResourceBundle; @@ -8,7 +8,7 @@ import javafx.scene.control.Button; import javafx.scene.control.MenuItem; import javafx.scene.layout.BorderPane; -import satyamconsignment.common.ViewLoader; +import openconsignment.common.ViewLoader; public class MainController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/WelcomeScreenController.java b/src/main/java/openconsignment/controller/WelcomeScreenController.java similarity index 93% rename from src/main/java/satyamconsignment/controller/WelcomeScreenController.java rename to src/main/java/openconsignment/controller/WelcomeScreenController.java index 9befd56..7c18198 100644 --- a/src/main/java/satyamconsignment/controller/WelcomeScreenController.java +++ b/src/main/java/openconsignment/controller/WelcomeScreenController.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package satyamconsignment.controller; +package openconsignment.controller; import java.net.URL; import java.util.ResourceBundle; diff --git a/src/main/java/satyamconsignment/controller/entry/EntryController.java b/src/main/java/openconsignment/controller/entry/EntryController.java similarity index 92% rename from src/main/java/satyamconsignment/controller/entry/EntryController.java rename to src/main/java/openconsignment/controller/entry/EntryController.java index 8e0c7d2..49d01ad 100644 --- a/src/main/java/satyamconsignment/controller/entry/EntryController.java +++ b/src/main/java/openconsignment/controller/entry/EntryController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.entry; +package openconsignment.controller.entry; import java.net.URL; import java.util.ResourceBundle; @@ -7,7 +7,7 @@ import javafx.fxml.Initializable; import javafx.scene.Group; import javafx.scene.control.Button; -import satyamconsignment.common.ViewLoader; +import openconsignment.common.ViewLoader; public class EntryController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/entry/bill/AddBillController.java b/src/main/java/openconsignment/controller/entry/bill/AddBillController.java similarity index 94% rename from src/main/java/satyamconsignment/controller/entry/bill/AddBillController.java rename to src/main/java/openconsignment/controller/entry/bill/AddBillController.java index 1d1be95..5e1541f 100644 --- a/src/main/java/satyamconsignment/controller/entry/bill/AddBillController.java +++ b/src/main/java/openconsignment/controller/entry/bill/AddBillController.java @@ -1,6 +1,6 @@ -package satyamconsignment.controller.entry.bill; +package openconsignment.controller.entry.bill; -import static satyamconsignment.common.Utils.formatDate; +import static openconsignment.common.Utils.formatDate; import java.net.URL; import java.util.List; @@ -14,13 +14,13 @@ import javafx.fxml.Initializable; import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; +import openconsignment.common.Utils; +import openconsignment.entity.BillEntity; +import openconsignment.entity.LREntity; +import openconsignment.model.LR; +import openconsignment.repository.*; +import openconsignment.service.*; import org.controlsfx.control.textfield.TextFields; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.entity.LREntity; -import satyamconsignment.model.LR; -import satyamconsignment.repository.*; -import satyamconsignment.service.*; public class AddBillController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/entry/bill/BillEntryController.java b/src/main/java/openconsignment/controller/entry/bill/BillEntryController.java similarity index 82% rename from src/main/java/satyamconsignment/controller/entry/bill/BillEntryController.java rename to src/main/java/openconsignment/controller/entry/bill/BillEntryController.java index 19d248b..2a69346 100644 --- a/src/main/java/satyamconsignment/controller/entry/bill/BillEntryController.java +++ b/src/main/java/openconsignment/controller/entry/bill/BillEntryController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.entry.bill; +package openconsignment.controller.entry.bill; import java.net.URL; import java.util.ResourceBundle; diff --git a/src/main/java/satyamconsignment/controller/entry/bill/ViewDeleteBillController.java b/src/main/java/openconsignment/controller/entry/bill/ViewDeleteBillController.java similarity index 94% rename from src/main/java/satyamconsignment/controller/entry/bill/ViewDeleteBillController.java rename to src/main/java/openconsignment/controller/entry/bill/ViewDeleteBillController.java index 31542e6..00e0262 100644 --- a/src/main/java/satyamconsignment/controller/entry/bill/ViewDeleteBillController.java +++ b/src/main/java/openconsignment/controller/entry/bill/ViewDeleteBillController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.entry.bill; +package openconsignment.controller.entry.bill; import java.net.URL; import java.sql.SQLException; @@ -11,11 +11,11 @@ import javafx.fxml.Initializable; import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.entity.LREntity; -import satyamconsignment.repository.BillRepository; -import satyamconsignment.service.BillService; +import openconsignment.common.Utils; +import openconsignment.entity.BillEntity; +import openconsignment.entity.LREntity; +import openconsignment.repository.BillRepository; +import openconsignment.service.BillService; public class ViewDeleteBillController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/entry/collection/AddCollectionController.java b/src/main/java/openconsignment/controller/entry/collection/AddCollectionController.java similarity index 94% rename from src/main/java/satyamconsignment/controller/entry/collection/AddCollectionController.java rename to src/main/java/openconsignment/controller/entry/collection/AddCollectionController.java index 53829e1..5dd6cdd 100644 --- a/src/main/java/satyamconsignment/controller/entry/collection/AddCollectionController.java +++ b/src/main/java/openconsignment/controller/entry/collection/AddCollectionController.java @@ -1,6 +1,6 @@ -package satyamconsignment.controller.entry.collection; +package openconsignment.controller.entry.collection; -import static satyamconsignment.common.Utils.formatDate; +import static openconsignment.common.Utils.formatDate; import java.net.URL; import java.sql.SQLException; @@ -14,18 +14,18 @@ import javafx.fxml.Initializable; import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; -import satyamconsignment.common.Constants; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.entity.CollectionEntity; -import satyamconsignment.entity.CollectionItemEntity; -import satyamconsignment.model.CollectionItem; -import satyamconsignment.repository.BillRepository; -import satyamconsignment.repository.BuyerRepository; -import satyamconsignment.repository.CollectionRepository; -import satyamconsignment.service.BillService; -import satyamconsignment.service.BuyerService; -import satyamconsignment.service.CollectionService; +import openconsignment.common.Constants; +import openconsignment.common.Utils; +import openconsignment.entity.BillEntity; +import openconsignment.entity.CollectionEntity; +import openconsignment.entity.CollectionItemEntity; +import openconsignment.model.CollectionItem; +import openconsignment.repository.BillRepository; +import openconsignment.repository.BuyerRepository; +import openconsignment.repository.CollectionRepository; +import openconsignment.service.BillService; +import openconsignment.service.BuyerService; +import openconsignment.service.CollectionService; public class AddCollectionController implements Initializable { private List collectionItemList; diff --git a/src/main/java/satyamconsignment/controller/entry/collection/CollectionEntryController.java b/src/main/java/openconsignment/controller/entry/collection/CollectionEntryController.java similarity index 81% rename from src/main/java/satyamconsignment/controller/entry/collection/CollectionEntryController.java rename to src/main/java/openconsignment/controller/entry/collection/CollectionEntryController.java index e5084c4..e52fdaa 100644 --- a/src/main/java/satyamconsignment/controller/entry/collection/CollectionEntryController.java +++ b/src/main/java/openconsignment/controller/entry/collection/CollectionEntryController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.entry.collection; +package openconsignment.controller.entry.collection; import java.net.URL; import java.util.ResourceBundle; diff --git a/src/main/java/satyamconsignment/controller/entry/collection/ViewDeleteCollectionController.java b/src/main/java/openconsignment/controller/entry/collection/ViewDeleteCollectionController.java similarity index 94% rename from src/main/java/satyamconsignment/controller/entry/collection/ViewDeleteCollectionController.java rename to src/main/java/openconsignment/controller/entry/collection/ViewDeleteCollectionController.java index 7b32253..fcd3b6e 100644 --- a/src/main/java/satyamconsignment/controller/entry/collection/ViewDeleteCollectionController.java +++ b/src/main/java/openconsignment/controller/entry/collection/ViewDeleteCollectionController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.entry.collection; +package openconsignment.controller.entry.collection; import java.io.IOException; import java.net.URL; @@ -14,12 +14,12 @@ import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Constants; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.CollectionEntity; -import satyamconsignment.model.CollectionItem; -import satyamconsignment.repository.CollectionRepository; -import satyamconsignment.service.CollectionService; +import openconsignment.common.Constants; +import openconsignment.common.Utils; +import openconsignment.entity.CollectionEntity; +import openconsignment.model.CollectionItem; +import openconsignment.repository.CollectionRepository; +import openconsignment.service.CollectionService; public class ViewDeleteCollectionController implements Initializable { private List collectionItemList; diff --git a/src/main/java/satyamconsignment/controller/entry/payment/AddPaymentController.java b/src/main/java/openconsignment/controller/entry/payment/AddPaymentController.java similarity index 95% rename from src/main/java/satyamconsignment/controller/entry/payment/AddPaymentController.java rename to src/main/java/openconsignment/controller/entry/payment/AddPaymentController.java index 09a5eeb..7839caa 100644 --- a/src/main/java/satyamconsignment/controller/entry/payment/AddPaymentController.java +++ b/src/main/java/openconsignment/controller/entry/payment/AddPaymentController.java @@ -1,6 +1,6 @@ -package satyamconsignment.controller.entry.payment; +package openconsignment.controller.entry.payment; -import static satyamconsignment.common.Utils.formatDate; +import static openconsignment.common.Utils.formatDate; import java.net.URL; import java.sql.SQLException; @@ -15,18 +15,18 @@ import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.text.Text; -import satyamconsignment.common.Constants; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.entity.PaymentEntity; -import satyamconsignment.entity.PaymentItemEntity; -import satyamconsignment.model.PaymentItem; -import satyamconsignment.repository.BillRepository; -import satyamconsignment.repository.PaymentRepository; -import satyamconsignment.repository.SupplierRepository; -import satyamconsignment.service.BillService; -import satyamconsignment.service.PaymentService; -import satyamconsignment.service.SupplierService; +import openconsignment.common.Constants; +import openconsignment.common.Utils; +import openconsignment.entity.BillEntity; +import openconsignment.entity.PaymentEntity; +import openconsignment.entity.PaymentItemEntity; +import openconsignment.model.PaymentItem; +import openconsignment.repository.BillRepository; +import openconsignment.repository.PaymentRepository; +import openconsignment.repository.SupplierRepository; +import openconsignment.service.BillService; +import openconsignment.service.PaymentService; +import openconsignment.service.SupplierService; public class AddPaymentController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/entry/payment/PaymentEntryController.java b/src/main/java/openconsignment/controller/entry/payment/PaymentEntryController.java similarity index 82% rename from src/main/java/satyamconsignment/controller/entry/payment/PaymentEntryController.java rename to src/main/java/openconsignment/controller/entry/payment/PaymentEntryController.java index fc971d8..2ca0a54 100644 --- a/src/main/java/satyamconsignment/controller/entry/payment/PaymentEntryController.java +++ b/src/main/java/openconsignment/controller/entry/payment/PaymentEntryController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.entry.payment; +package openconsignment.controller.entry.payment; import java.net.URL; import java.util.ResourceBundle; diff --git a/src/main/java/satyamconsignment/controller/entry/payment/ViewDeletePaymentController.java b/src/main/java/openconsignment/controller/entry/payment/ViewDeletePaymentController.java similarity index 94% rename from src/main/java/satyamconsignment/controller/entry/payment/ViewDeletePaymentController.java rename to src/main/java/openconsignment/controller/entry/payment/ViewDeletePaymentController.java index e64ab15..b0b9038 100644 --- a/src/main/java/satyamconsignment/controller/entry/payment/ViewDeletePaymentController.java +++ b/src/main/java/openconsignment/controller/entry/payment/ViewDeletePaymentController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.entry.payment; +package openconsignment.controller.entry.payment; import java.io.IOException; import java.net.URL; @@ -14,13 +14,13 @@ import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Constants; -import satyamconsignment.common.DatabaseHandler; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.PaymentEntity; -import satyamconsignment.model.PaymentItem; -import satyamconsignment.repository.PaymentRepository; -import satyamconsignment.service.PaymentService; +import openconsignment.common.Constants; +import openconsignment.common.DatabaseHandler; +import openconsignment.common.Utils; +import openconsignment.entity.PaymentEntity; +import openconsignment.model.PaymentItem; +import openconsignment.repository.PaymentRepository; +import openconsignment.service.PaymentService; public class ViewDeletePaymentController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/history/BillHistoryController.java b/src/main/java/openconsignment/controller/history/BillHistoryController.java similarity index 90% rename from src/main/java/satyamconsignment/controller/history/BillHistoryController.java rename to src/main/java/openconsignment/controller/history/BillHistoryController.java index 60fb752..beb2490 100644 --- a/src/main/java/satyamconsignment/controller/history/BillHistoryController.java +++ b/src/main/java/openconsignment/controller/history/BillHistoryController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.history; +package openconsignment.controller.history; import java.net.URL; import java.sql.SQLException; @@ -13,10 +13,10 @@ import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.repository.BillRepository; -import satyamconsignment.service.BillService; +import openconsignment.common.Utils; +import openconsignment.entity.BillEntity; +import openconsignment.repository.BillRepository; +import openconsignment.service.BillService; public class BillHistoryController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/history/CollectionHistoryController.java b/src/main/java/openconsignment/controller/history/CollectionHistoryController.java similarity index 88% rename from src/main/java/satyamconsignment/controller/history/CollectionHistoryController.java rename to src/main/java/openconsignment/controller/history/CollectionHistoryController.java index 5bce9a8..f8096ea 100644 --- a/src/main/java/satyamconsignment/controller/history/CollectionHistoryController.java +++ b/src/main/java/openconsignment/controller/history/CollectionHistoryController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.history; +package openconsignment.controller.history; import java.net.URL; import java.sql.SQLException; @@ -13,10 +13,10 @@ import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.CollectionEntity; -import satyamconsignment.repository.CollectionRepository; -import satyamconsignment.service.CollectionService; +import openconsignment.common.Utils; +import openconsignment.entity.CollectionEntity; +import openconsignment.repository.CollectionRepository; +import openconsignment.service.CollectionService; public class CollectionHistoryController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/history/PaymentHistoryController.java b/src/main/java/openconsignment/controller/history/PaymentHistoryController.java similarity index 88% rename from src/main/java/satyamconsignment/controller/history/PaymentHistoryController.java rename to src/main/java/openconsignment/controller/history/PaymentHistoryController.java index a70bbd1..191a735 100644 --- a/src/main/java/satyamconsignment/controller/history/PaymentHistoryController.java +++ b/src/main/java/openconsignment/controller/history/PaymentHistoryController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.history; +package openconsignment.controller.history; import java.net.URL; import java.sql.SQLException; @@ -13,10 +13,10 @@ import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.PaymentEntity; -import satyamconsignment.repository.PaymentRepository; -import satyamconsignment.service.PaymentService; +import openconsignment.common.Utils; +import openconsignment.entity.PaymentEntity; +import openconsignment.repository.PaymentRepository; +import openconsignment.service.PaymentService; public class PaymentHistoryController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/master/BuyerController.java b/src/main/java/openconsignment/controller/master/BuyerController.java similarity index 91% rename from src/main/java/satyamconsignment/controller/master/BuyerController.java rename to src/main/java/openconsignment/controller/master/BuyerController.java index 5fe46b5..d6068b9 100644 --- a/src/main/java/satyamconsignment/controller/master/BuyerController.java +++ b/src/main/java/openconsignment/controller/master/BuyerController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.master; +package openconsignment.controller.master; import java.net.URL; import java.sql.SQLException; @@ -12,11 +12,11 @@ import javafx.scene.control.Button; import javafx.scene.control.ListView; import javafx.scene.control.TextField; -import satyamconsignment.common.Utils; -import satyamconsignment.repository.BuyerRepository; -import satyamconsignment.repository.CollectionRepository; -import satyamconsignment.service.BuyerService; -import satyamconsignment.service.CollectionService; +import openconsignment.common.Utils; +import openconsignment.repository.BuyerRepository; +import openconsignment.repository.CollectionRepository; +import openconsignment.service.BuyerService; +import openconsignment.service.CollectionService; public class BuyerController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/master/MasterController.java b/src/main/java/openconsignment/controller/master/MasterController.java similarity index 93% rename from src/main/java/satyamconsignment/controller/master/MasterController.java rename to src/main/java/openconsignment/controller/master/MasterController.java index 81b65ec..30da0e3 100644 --- a/src/main/java/satyamconsignment/controller/master/MasterController.java +++ b/src/main/java/openconsignment/controller/master/MasterController.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package satyamconsignment.controller.master; +package openconsignment.controller.master; import java.net.URL; import java.util.ResourceBundle; @@ -12,7 +12,7 @@ import javafx.fxml.Initializable; import javafx.scene.Group; import javafx.scene.control.Button; -import satyamconsignment.common.ViewLoader; +import openconsignment.common.ViewLoader; /** * FXML Controller class diff --git a/src/main/java/satyamconsignment/controller/master/SupplierController.java b/src/main/java/openconsignment/controller/master/SupplierController.java similarity index 91% rename from src/main/java/satyamconsignment/controller/master/SupplierController.java rename to src/main/java/openconsignment/controller/master/SupplierController.java index a1c4476..0684bfe 100644 --- a/src/main/java/satyamconsignment/controller/master/SupplierController.java +++ b/src/main/java/openconsignment/controller/master/SupplierController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.master; +package openconsignment.controller.master; import java.net.URL; import java.sql.SQLException; @@ -12,11 +12,11 @@ import javafx.scene.control.Button; import javafx.scene.control.ListView; import javafx.scene.control.TextField; -import satyamconsignment.common.Utils; -import satyamconsignment.repository.PaymentRepository; -import satyamconsignment.repository.SupplierRepository; -import satyamconsignment.service.PaymentService; -import satyamconsignment.service.SupplierService; +import openconsignment.common.Utils; +import openconsignment.repository.PaymentRepository; +import openconsignment.repository.SupplierRepository; +import openconsignment.service.PaymentService; +import openconsignment.service.SupplierService; public class SupplierController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/master/TransportController.java b/src/main/java/openconsignment/controller/master/TransportController.java similarity index 94% rename from src/main/java/satyamconsignment/controller/master/TransportController.java rename to src/main/java/openconsignment/controller/master/TransportController.java index b31d4d8..7391c61 100644 --- a/src/main/java/satyamconsignment/controller/master/TransportController.java +++ b/src/main/java/openconsignment/controller/master/TransportController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.master; +package openconsignment.controller.master; import java.net.URL; import java.sql.SQLException; @@ -12,9 +12,9 @@ import javafx.scene.control.Button; import javafx.scene.control.ListView; import javafx.scene.control.TextField; -import satyamconsignment.common.Utils; -import satyamconsignment.repository.TransportRepository; -import satyamconsignment.service.TransportService; +import openconsignment.common.Utils; +import openconsignment.repository.TransportRepository; +import openconsignment.service.TransportService; public class TransportController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/report/BuyerLedgerController.java b/src/main/java/openconsignment/controller/report/BuyerLedgerController.java similarity index 88% rename from src/main/java/satyamconsignment/controller/report/BuyerLedgerController.java rename to src/main/java/openconsignment/controller/report/BuyerLedgerController.java index e6dd3c1..0611b14 100644 --- a/src/main/java/satyamconsignment/controller/report/BuyerLedgerController.java +++ b/src/main/java/openconsignment/controller/report/BuyerLedgerController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.report; +package openconsignment.controller.report; import java.io.IOException; import java.net.URL; @@ -16,12 +16,12 @@ import javafx.scene.control.RadioButton; import javafx.scene.control.ToggleGroup; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Constants; -import satyamconsignment.common.Utils; -import satyamconsignment.repository.BuyerRepository; -import satyamconsignment.repository.CollectionRepository; -import satyamconsignment.service.BuyerService; -import satyamconsignment.service.CollectionService; +import openconsignment.common.Constants; +import openconsignment.common.Utils; +import openconsignment.repository.BuyerRepository; +import openconsignment.repository.CollectionRepository; +import openconsignment.service.BuyerService; +import openconsignment.service.CollectionService; public class BuyerLedgerController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/report/ReportController.java b/src/main/java/openconsignment/controller/report/ReportController.java similarity index 92% rename from src/main/java/satyamconsignment/controller/report/ReportController.java rename to src/main/java/openconsignment/controller/report/ReportController.java index 61e8fa8..8845496 100644 --- a/src/main/java/satyamconsignment/controller/report/ReportController.java +++ b/src/main/java/openconsignment/controller/report/ReportController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.report; +package openconsignment.controller.report; import java.net.URL; import java.util.ResourceBundle; @@ -7,7 +7,7 @@ import javafx.fxml.Initializable; import javafx.scene.Group; import javafx.scene.control.Button; -import satyamconsignment.common.ViewLoader; +import openconsignment.common.ViewLoader; public class ReportController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/report/SupplierLedgerController.java b/src/main/java/openconsignment/controller/report/SupplierLedgerController.java similarity index 88% rename from src/main/java/satyamconsignment/controller/report/SupplierLedgerController.java rename to src/main/java/openconsignment/controller/report/SupplierLedgerController.java index e8088b1..7a9d5f7 100644 --- a/src/main/java/satyamconsignment/controller/report/SupplierLedgerController.java +++ b/src/main/java/openconsignment/controller/report/SupplierLedgerController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.report; +package openconsignment.controller.report; import java.io.IOException; import java.net.URL; @@ -16,12 +16,12 @@ import javafx.scene.control.RadioButton; import javafx.scene.control.ToggleGroup; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Constants; -import satyamconsignment.common.Utils; -import satyamconsignment.repository.PaymentRepository; -import satyamconsignment.repository.SupplierRepository; -import satyamconsignment.service.PaymentService; -import satyamconsignment.service.SupplierService; +import openconsignment.common.Constants; +import openconsignment.common.Utils; +import openconsignment.repository.PaymentRepository; +import openconsignment.repository.SupplierRepository; +import openconsignment.service.PaymentService; +import openconsignment.service.SupplierService; public class SupplierLedgerController implements Initializable { diff --git a/src/main/java/satyamconsignment/controller/report/TransportLedgerController.java b/src/main/java/openconsignment/controller/report/TransportLedgerController.java similarity index 92% rename from src/main/java/satyamconsignment/controller/report/TransportLedgerController.java rename to src/main/java/openconsignment/controller/report/TransportLedgerController.java index f36efcb..6e84a46 100644 --- a/src/main/java/satyamconsignment/controller/report/TransportLedgerController.java +++ b/src/main/java/openconsignment/controller/report/TransportLedgerController.java @@ -1,4 +1,4 @@ -package satyamconsignment.controller.report; +package openconsignment.controller.report; import java.io.IOException; import java.net.URL; @@ -15,10 +15,10 @@ import javafx.scene.control.ComboBox; import javafx.scene.control.DatePicker; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Constants; -import satyamconsignment.common.Utils; -import satyamconsignment.repository.TransportRepository; -import satyamconsignment.service.TransportService; +import openconsignment.common.Constants; +import openconsignment.common.Utils; +import openconsignment.repository.TransportRepository; +import openconsignment.service.TransportService; public class TransportLedgerController implements Initializable { diff --git a/src/main/java/satyamconsignment/entity/BillEntity.java b/src/main/java/openconsignment/entity/BillEntity.java similarity index 92% rename from src/main/java/satyamconsignment/entity/BillEntity.java rename to src/main/java/openconsignment/entity/BillEntity.java index dac5283..eee6538 100644 --- a/src/main/java/satyamconsignment/entity/BillEntity.java +++ b/src/main/java/openconsignment/entity/BillEntity.java @@ -1,4 +1,4 @@ -package satyamconsignment.entity; +package openconsignment.entity; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/satyamconsignment/entity/CollectionEntity.java b/src/main/java/openconsignment/entity/CollectionEntity.java similarity index 89% rename from src/main/java/satyamconsignment/entity/CollectionEntity.java rename to src/main/java/openconsignment/entity/CollectionEntity.java index ab52036..06c5b82 100644 --- a/src/main/java/satyamconsignment/entity/CollectionEntity.java +++ b/src/main/java/openconsignment/entity/CollectionEntity.java @@ -1,4 +1,4 @@ -package satyamconsignment.entity; +package openconsignment.entity; import java.util.List; import lombok.Builder; diff --git a/src/main/java/satyamconsignment/entity/CollectionItemEntity.java b/src/main/java/openconsignment/entity/CollectionItemEntity.java similarity index 92% rename from src/main/java/satyamconsignment/entity/CollectionItemEntity.java rename to src/main/java/openconsignment/entity/CollectionItemEntity.java index 97a2f07..d5edef5 100644 --- a/src/main/java/satyamconsignment/entity/CollectionItemEntity.java +++ b/src/main/java/openconsignment/entity/CollectionItemEntity.java @@ -1,4 +1,4 @@ -package satyamconsignment.entity; +package openconsignment.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/satyamconsignment/entity/LREntity.java b/src/main/java/openconsignment/entity/LREntity.java similarity index 86% rename from src/main/java/satyamconsignment/entity/LREntity.java rename to src/main/java/openconsignment/entity/LREntity.java index bc3cae4..c46ac40 100644 --- a/src/main/java/satyamconsignment/entity/LREntity.java +++ b/src/main/java/openconsignment/entity/LREntity.java @@ -1,4 +1,4 @@ -package satyamconsignment.entity; +package openconsignment.entity; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/satyamconsignment/entity/PaymentEntity.java b/src/main/java/openconsignment/entity/PaymentEntity.java similarity index 90% rename from src/main/java/satyamconsignment/entity/PaymentEntity.java rename to src/main/java/openconsignment/entity/PaymentEntity.java index 513debb..6504079 100644 --- a/src/main/java/satyamconsignment/entity/PaymentEntity.java +++ b/src/main/java/openconsignment/entity/PaymentEntity.java @@ -1,4 +1,4 @@ -package satyamconsignment.entity; +package openconsignment.entity; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/satyamconsignment/entity/PaymentItemEntity.java b/src/main/java/openconsignment/entity/PaymentItemEntity.java similarity index 91% rename from src/main/java/satyamconsignment/entity/PaymentItemEntity.java rename to src/main/java/openconsignment/entity/PaymentItemEntity.java index 0aaa0fd..e5b8d42 100644 --- a/src/main/java/satyamconsignment/entity/PaymentItemEntity.java +++ b/src/main/java/openconsignment/entity/PaymentItemEntity.java @@ -1,4 +1,4 @@ -package satyamconsignment.entity; +package openconsignment.entity; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/satyamconsignment/model/BuyerLedgerAgeRow.java b/src/main/java/openconsignment/model/BuyerLedgerAgeRow.java similarity index 89% rename from src/main/java/satyamconsignment/model/BuyerLedgerAgeRow.java rename to src/main/java/openconsignment/model/BuyerLedgerAgeRow.java index f89fb82..4c6fcd6 100644 --- a/src/main/java/satyamconsignment/model/BuyerLedgerAgeRow.java +++ b/src/main/java/openconsignment/model/BuyerLedgerAgeRow.java @@ -1,4 +1,4 @@ -package satyamconsignment.model; +package openconsignment.model; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/satyamconsignment/model/BuyerLedgerRow.java b/src/main/java/openconsignment/model/BuyerLedgerRow.java similarity index 93% rename from src/main/java/satyamconsignment/model/BuyerLedgerRow.java rename to src/main/java/openconsignment/model/BuyerLedgerRow.java index 4a2065b..469add8 100644 --- a/src/main/java/satyamconsignment/model/BuyerLedgerRow.java +++ b/src/main/java/openconsignment/model/BuyerLedgerRow.java @@ -1,4 +1,4 @@ -package satyamconsignment.model; +package openconsignment.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/satyamconsignment/model/CollectionItem.java b/src/main/java/openconsignment/model/CollectionItem.java similarity index 94% rename from src/main/java/satyamconsignment/model/CollectionItem.java rename to src/main/java/openconsignment/model/CollectionItem.java index fa76d44..f164db3 100644 --- a/src/main/java/satyamconsignment/model/CollectionItem.java +++ b/src/main/java/openconsignment/model/CollectionItem.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package satyamconsignment.model; +package openconsignment.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/satyamconsignment/model/LR.java b/src/main/java/openconsignment/model/LR.java similarity index 86% rename from src/main/java/satyamconsignment/model/LR.java rename to src/main/java/openconsignment/model/LR.java index 9d3f8c7..058a24a 100644 --- a/src/main/java/satyamconsignment/model/LR.java +++ b/src/main/java/openconsignment/model/LR.java @@ -1,4 +1,4 @@ -package satyamconsignment.model; +package openconsignment.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/satyamconsignment/model/PaymentItem.java b/src/main/java/openconsignment/model/PaymentItem.java similarity index 92% rename from src/main/java/satyamconsignment/model/PaymentItem.java rename to src/main/java/openconsignment/model/PaymentItem.java index fab42a2..a5d98d5 100644 --- a/src/main/java/satyamconsignment/model/PaymentItem.java +++ b/src/main/java/openconsignment/model/PaymentItem.java @@ -1,4 +1,4 @@ -package satyamconsignment.model; +package openconsignment.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/satyamconsignment/model/SupplierLedgerAgeRow.java b/src/main/java/openconsignment/model/SupplierLedgerAgeRow.java similarity index 89% rename from src/main/java/satyamconsignment/model/SupplierLedgerAgeRow.java rename to src/main/java/openconsignment/model/SupplierLedgerAgeRow.java index da4b6b5..d26e97a 100644 --- a/src/main/java/satyamconsignment/model/SupplierLedgerAgeRow.java +++ b/src/main/java/openconsignment/model/SupplierLedgerAgeRow.java @@ -1,4 +1,4 @@ -package satyamconsignment.model; +package openconsignment.model; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/satyamconsignment/model/SupplierLedgerRow.java b/src/main/java/openconsignment/model/SupplierLedgerRow.java similarity index 93% rename from src/main/java/satyamconsignment/model/SupplierLedgerRow.java rename to src/main/java/openconsignment/model/SupplierLedgerRow.java index d3f8c50..e40116e 100644 --- a/src/main/java/satyamconsignment/model/SupplierLedgerRow.java +++ b/src/main/java/openconsignment/model/SupplierLedgerRow.java @@ -1,4 +1,4 @@ -package satyamconsignment.model; +package openconsignment.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/satyamconsignment/model/TransportLedgerRow.java b/src/main/java/openconsignment/model/TransportLedgerRow.java similarity index 89% rename from src/main/java/satyamconsignment/model/TransportLedgerRow.java rename to src/main/java/openconsignment/model/TransportLedgerRow.java index 346e724..fe5e1f6 100644 --- a/src/main/java/satyamconsignment/model/TransportLedgerRow.java +++ b/src/main/java/openconsignment/model/TransportLedgerRow.java @@ -1,4 +1,4 @@ -package satyamconsignment.model; +package openconsignment.model; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/satyamconsignment/repository/BillRepository.java b/src/main/java/openconsignment/repository/BillRepository.java similarity index 97% rename from src/main/java/satyamconsignment/repository/BillRepository.java rename to src/main/java/openconsignment/repository/BillRepository.java index a6f9443..82b722d 100644 --- a/src/main/java/satyamconsignment/repository/BillRepository.java +++ b/src/main/java/openconsignment/repository/BillRepository.java @@ -1,4 +1,4 @@ -package satyamconsignment.repository; +package openconsignment.repository; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,9 +8,9 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import satyamconsignment.common.DatabaseHandler; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.entity.LREntity; +import openconsignment.common.DatabaseHandler; +import openconsignment.entity.BillEntity; +import openconsignment.entity.LREntity; public class BillRepository { diff --git a/src/main/java/satyamconsignment/repository/BuyerRepository.java b/src/main/java/openconsignment/repository/BuyerRepository.java similarity index 96% rename from src/main/java/satyamconsignment/repository/BuyerRepository.java rename to src/main/java/openconsignment/repository/BuyerRepository.java index 927598e..83da10d 100644 --- a/src/main/java/satyamconsignment/repository/BuyerRepository.java +++ b/src/main/java/openconsignment/repository/BuyerRepository.java @@ -1,4 +1,4 @@ -package satyamconsignment.repository; +package openconsignment.repository; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,7 +8,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import satyamconsignment.common.DatabaseHandler; +import openconsignment.common.DatabaseHandler; public class BuyerRepository { diff --git a/src/main/java/satyamconsignment/repository/CollectionRepository.java b/src/main/java/openconsignment/repository/CollectionRepository.java similarity index 98% rename from src/main/java/satyamconsignment/repository/CollectionRepository.java rename to src/main/java/openconsignment/repository/CollectionRepository.java index 6c20862..ea67a26 100644 --- a/src/main/java/satyamconsignment/repository/CollectionRepository.java +++ b/src/main/java/openconsignment/repository/CollectionRepository.java @@ -1,4 +1,4 @@ -package satyamconsignment.repository; +package openconsignment.repository; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,12 +8,12 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import satyamconsignment.common.DatabaseHandler; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.entity.CollectionEntity; -import satyamconsignment.entity.CollectionItemEntity; -import satyamconsignment.model.BuyerLedgerRow; +import openconsignment.common.DatabaseHandler; +import openconsignment.common.Utils; +import openconsignment.entity.BillEntity; +import openconsignment.entity.CollectionEntity; +import openconsignment.entity.CollectionItemEntity; +import openconsignment.model.BuyerLedgerRow; public class CollectionRepository { diff --git a/src/main/java/satyamconsignment/repository/PaymentRepository.java b/src/main/java/openconsignment/repository/PaymentRepository.java similarity index 97% rename from src/main/java/satyamconsignment/repository/PaymentRepository.java rename to src/main/java/openconsignment/repository/PaymentRepository.java index 26ce32e..ee042b8 100644 --- a/src/main/java/satyamconsignment/repository/PaymentRepository.java +++ b/src/main/java/openconsignment/repository/PaymentRepository.java @@ -1,4 +1,4 @@ -package satyamconsignment.repository; +package openconsignment.repository; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,12 +8,12 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import satyamconsignment.common.DatabaseHandler; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.entity.PaymentEntity; -import satyamconsignment.entity.PaymentItemEntity; -import satyamconsignment.model.SupplierLedgerRow; +import openconsignment.common.DatabaseHandler; +import openconsignment.common.Utils; +import openconsignment.entity.BillEntity; +import openconsignment.entity.PaymentEntity; +import openconsignment.entity.PaymentItemEntity; +import openconsignment.model.SupplierLedgerRow; public class PaymentRepository { diff --git a/src/main/java/satyamconsignment/repository/SupplierRepository.java b/src/main/java/openconsignment/repository/SupplierRepository.java similarity index 96% rename from src/main/java/satyamconsignment/repository/SupplierRepository.java rename to src/main/java/openconsignment/repository/SupplierRepository.java index e67802f..139e7dc 100644 --- a/src/main/java/satyamconsignment/repository/SupplierRepository.java +++ b/src/main/java/openconsignment/repository/SupplierRepository.java @@ -1,4 +1,4 @@ -package satyamconsignment.repository; +package openconsignment.repository; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,7 +8,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import satyamconsignment.common.DatabaseHandler; +import openconsignment.common.DatabaseHandler; public class SupplierRepository { diff --git a/src/main/java/satyamconsignment/repository/TransportRepository.java b/src/main/java/openconsignment/repository/TransportRepository.java similarity index 97% rename from src/main/java/satyamconsignment/repository/TransportRepository.java rename to src/main/java/openconsignment/repository/TransportRepository.java index 035f082..299b137 100644 --- a/src/main/java/satyamconsignment/repository/TransportRepository.java +++ b/src/main/java/openconsignment/repository/TransportRepository.java @@ -1,4 +1,4 @@ -package satyamconsignment.repository; +package openconsignment.repository; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,8 +8,8 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import satyamconsignment.common.DatabaseHandler; -import satyamconsignment.model.TransportLedgerRow; +import openconsignment.common.DatabaseHandler; +import openconsignment.model.TransportLedgerRow; public class TransportRepository { diff --git a/src/main/java/satyamconsignment/service/BillService.java b/src/main/java/openconsignment/service/BillService.java similarity index 84% rename from src/main/java/satyamconsignment/service/BillService.java rename to src/main/java/openconsignment/service/BillService.java index 4f846e5..bab7138 100644 --- a/src/main/java/satyamconsignment/service/BillService.java +++ b/src/main/java/openconsignment/service/BillService.java @@ -1,9 +1,9 @@ -package satyamconsignment.service; +package openconsignment.service; import java.sql.SQLException; import java.util.List; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.repository.BillRepository; +import openconsignment.entity.BillEntity; +import openconsignment.repository.BillRepository; public class BillService { diff --git a/src/main/java/satyamconsignment/service/BuyerService.java b/src/main/java/openconsignment/service/BuyerService.java similarity index 91% rename from src/main/java/satyamconsignment/service/BuyerService.java rename to src/main/java/openconsignment/service/BuyerService.java index 21bb5ca..29878f5 100644 --- a/src/main/java/satyamconsignment/service/BuyerService.java +++ b/src/main/java/openconsignment/service/BuyerService.java @@ -1,4 +1,4 @@ -package satyamconsignment.service; +package openconsignment.service; import java.sql.SQLException; import java.time.LocalDate; @@ -7,10 +7,10 @@ import java.util.List; import java.util.Map; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Utils; -import satyamconsignment.model.BuyerLedgerAgeRow; -import satyamconsignment.model.BuyerLedgerRow; -import satyamconsignment.repository.BuyerRepository; +import openconsignment.common.Utils; +import openconsignment.model.BuyerLedgerAgeRow; +import openconsignment.model.BuyerLedgerRow; +import openconsignment.repository.BuyerRepository; public class BuyerService { diff --git a/src/main/java/satyamconsignment/service/CollectionService.java b/src/main/java/openconsignment/service/CollectionService.java similarity index 88% rename from src/main/java/satyamconsignment/service/CollectionService.java rename to src/main/java/openconsignment/service/CollectionService.java index 3b7a911..b1a7236 100644 --- a/src/main/java/satyamconsignment/service/CollectionService.java +++ b/src/main/java/openconsignment/service/CollectionService.java @@ -1,16 +1,16 @@ -package satyamconsignment.service; +package openconsignment.service; import java.sql.SQLException; import java.util.HashMap; import java.util.List; import java.util.Map; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.BillEntity; -import satyamconsignment.entity.CollectionEntity; -import satyamconsignment.entity.CollectionItemEntity; -import satyamconsignment.model.BuyerLedgerRow; -import satyamconsignment.repository.CollectionRepository; +import openconsignment.common.Utils; +import openconsignment.entity.BillEntity; +import openconsignment.entity.CollectionEntity; +import openconsignment.entity.CollectionItemEntity; +import openconsignment.model.BuyerLedgerRow; +import openconsignment.repository.CollectionRepository; public class CollectionService { diff --git a/src/main/java/satyamconsignment/service/PaymentService.java b/src/main/java/openconsignment/service/PaymentService.java similarity index 91% rename from src/main/java/satyamconsignment/service/PaymentService.java rename to src/main/java/openconsignment/service/PaymentService.java index e301a7f..1582e6e 100644 --- a/src/main/java/satyamconsignment/service/PaymentService.java +++ b/src/main/java/openconsignment/service/PaymentService.java @@ -1,14 +1,14 @@ -package satyamconsignment.service; +package openconsignment.service; import java.sql.SQLException; import java.util.HashMap; import java.util.List; import java.util.Map; import net.sf.jasperreports.engine.JRException; -import satyamconsignment.common.Utils; -import satyamconsignment.entity.*; -import satyamconsignment.model.SupplierLedgerRow; -import satyamconsignment.repository.PaymentRepository; +import openconsignment.common.Utils; +import openconsignment.entity.*; +import openconsignment.model.SupplierLedgerRow; +import openconsignment.repository.PaymentRepository; public class PaymentService { diff --git a/src/main/java/satyamconsignment/service/SupplierService.java b/src/main/java/openconsignment/service/SupplierService.java similarity index 91% rename from src/main/java/satyamconsignment/service/SupplierService.java rename to src/main/java/openconsignment/service/SupplierService.java index 79e757b..07c3e2b 100644 --- a/src/main/java/satyamconsignment/service/SupplierService.java +++ b/src/main/java/openconsignment/service/SupplierService.java @@ -1,4 +1,4 @@ -package satyamconsignment.service; +package openconsignment.service; import java.sql.SQLException; import java.time.LocalDate; @@ -7,10 +7,10 @@ import java.util.List; import java.util.Map; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Utils; -import satyamconsignment.model.SupplierLedgerAgeRow; -import satyamconsignment.model.SupplierLedgerRow; -import satyamconsignment.repository.SupplierRepository; +import openconsignment.common.Utils; +import openconsignment.model.SupplierLedgerAgeRow; +import openconsignment.model.SupplierLedgerRow; +import openconsignment.repository.SupplierRepository; public class SupplierService { diff --git a/src/main/java/satyamconsignment/service/TransportService.java b/src/main/java/openconsignment/service/TransportService.java similarity index 89% rename from src/main/java/satyamconsignment/service/TransportService.java rename to src/main/java/openconsignment/service/TransportService.java index 65d58fa..6247d61 100644 --- a/src/main/java/satyamconsignment/service/TransportService.java +++ b/src/main/java/openconsignment/service/TransportService.java @@ -1,13 +1,13 @@ -package satyamconsignment.service; +package openconsignment.service; import java.sql.SQLException; import java.util.HashMap; import java.util.List; import java.util.Map; import net.sf.jasperreports.engine.*; -import satyamconsignment.common.Utils; -import satyamconsignment.model.TransportLedgerRow; -import satyamconsignment.repository.TransportRepository; +import openconsignment.common.Utils; +import openconsignment.model.TransportLedgerRow; +import openconsignment.repository.TransportRepository; public class TransportService { diff --git a/src/main/resources/fxml/Main.fxml b/src/main/resources/fxml/Main.fxml index df3c740..04a7e21 100644 --- a/src/main/resources/fxml/Main.fxml +++ b/src/main/resources/fxml/Main.fxml @@ -7,7 +7,7 @@ - +
diff --git a/src/main/resources/fxml/WelcomeScreen.fxml b/src/main/resources/fxml/WelcomeScreen.fxml index 83f51f2..643cd62 100644 --- a/src/main/resources/fxml/WelcomeScreen.fxml +++ b/src/main/resources/fxml/WelcomeScreen.fxml @@ -8,7 +8,7 @@ - + @@ -19,14 +19,14 @@ - - - + + + - + @@ -39,17 +39,12 @@ - - - - - - + - + diff --git a/src/main/resources/fxml/entry/Input.fxml b/src/main/resources/fxml/entry/Input.fxml index 2b05ec8..2b26996 100644 --- a/src/main/resources/fxml/entry/Input.fxml +++ b/src/main/resources/fxml/entry/Input.fxml @@ -9,7 +9,7 @@ + fx:controller="openconsignment.controller.entry.EntryController"> diff --git a/src/main/resources/fxml/entry/bill/AddBill.fxml b/src/main/resources/fxml/entry/bill/AddBill.fxml index 571c466..fc15173 100644 --- a/src/main/resources/fxml/entry/bill/AddBill.fxml +++ b/src/main/resources/fxml/entry/bill/AddBill.fxml @@ -6,7 +6,7 @@ + xmlns:fx="http://javafx.com/fxml/1" fx:controller="openconsignment.controller.entry.bill.AddBillController">