From: epinzolas001 Date: Mon, 18 May 2015 11:12:36 +0000 (+0200) Subject: debugging X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/commitdiff_plain/7999499eee1fc932aeef9a813206d37313d7a753?hp=4f8bcc7fa6ac7640915ac3aa5e115b6d37c08a86 debugging --- diff --git a/ruralHouses client/src/common/AccountInterface.java b/ruralHouses client/src/common/AccountInterface.java index a6f3df9..cb53684 100644 --- a/ruralHouses client/src/common/AccountInterface.java +++ b/ruralHouses client/src/common/AccountInterface.java @@ -4,6 +4,7 @@ import java.rmi.Remote; import java.rmi.RemoteException; import domain.Account; +import domain.Owner; public interface AccountInterface extends Remote{ diff --git a/ruralHouses client/src/common/AdminInterface.java b/ruralHouses client/src/common/AdminInterface.java index eb5e888..c45a81c 100644 --- a/ruralHouses client/src/common/AdminInterface.java +++ b/ruralHouses client/src/common/AdminInterface.java @@ -5,6 +5,7 @@ import java.rmi.RemoteException; import java.util.Vector; import domain.Account; +import domain.Owner; import domain.RuralHouse; public interface AdminInterface extends Remote { @@ -26,7 +27,8 @@ public interface AdminInterface extends Remote { public boolean addDeletionRequest(RuralHouse rh) throws RemoteException ; - public boolean addAccount(Account acc) throws RemoteException ; + public boolean addAccountRequest(String usr, + String pss, Owner ow) throws RemoteException; public void saveInstance() throws RemoteException; diff --git a/ruralHouses client/src/domain/Account.java b/ruralHouses client/src/domain/Account.java index 851e547..19fc1f5 100644 --- a/ruralHouses client/src/domain/Account.java +++ b/ruralHouses client/src/domain/Account.java @@ -22,19 +22,7 @@ public class Account implements Serializable { private boolean admin = false; - public Account(String usr){ - - - } - public Account(String usr, String pass, boolean isAdmin) { - - - } - - public Account(String usr, String pass, Owner ow) { - - - } + public byte[] getUsername() { return username; diff --git a/ruralHouses client/src/gui/ModifyOfferGUI.java b/ruralHouses client/src/gui/ModifyOfferGUI.java index 4dbdacc..a0751ca 100644 --- a/ruralHouses client/src/gui/ModifyOfferGUI.java +++ b/ruralHouses client/src/gui/ModifyOfferGUI.java @@ -68,6 +68,8 @@ public class ModifyOfferGUI extends JFrame { this.setSize(new Dimension(513, 433)); this.setTitle("Set availability"); + OfferInterface om = null; + jComboBox1 = new JComboBox(v); comboBox_o = new JComboBox( diff --git a/ruralHouses client/src/gui/OwnerRegistrationGUI.java b/ruralHouses client/src/gui/OwnerRegistrationGUI.java index fad1933..b547b82 100644 --- a/ruralHouses client/src/gui/OwnerRegistrationGUI.java +++ b/ruralHouses client/src/gui/OwnerRegistrationGUI.java @@ -140,11 +140,12 @@ public class OwnerRegistrationGUI extends JFrame { this.bank1Field.getText() + " " + this.bank2Field.getText() + " " + this.bank3Field.getText() + " " + this.bank4Field.getText(), this.emailField.getText()); - Account acc = new Account(this.userNameField.getText(), - this.passField.getText(), own); + try { - if (this.am.addAccount(acc)) { + if (this.am.addAccountRequest(this.userNameField.getText(), + this.passField.getText(), own)) { + this.am.saveInstance(); this.feedback.setText("Request sended"); } else { this.feedback.setText("Can't send the request"); diff --git a/ruralHouses client/src/gui/RequestDeleteHouseGUI.java b/ruralHouses client/src/gui/RequestDeleteHouseGUI.java index a888e32..4bd854c 100644 --- a/ruralHouses client/src/gui/RequestDeleteHouseGUI.java +++ b/ruralHouses client/src/gui/RequestDeleteHouseGUI.java @@ -97,6 +97,7 @@ public class RequestDeleteHouseGUI extends JFrame { try { if(am.addDeletionRequest(toDel)){ + am.saveInstance(); feedback.setText("Delete request sended"); }else{ diff --git a/ruralHouses client/src/gui/RequestNewHouseGUI.java b/ruralHouses client/src/gui/RequestNewHouseGUI.java index 185e47d..e22a4f2 100644 --- a/ruralHouses client/src/gui/RequestNewHouseGUI.java +++ b/ruralHouses client/src/gui/RequestNewHouseGUI.java @@ -146,6 +146,7 @@ public class RequestNewHouseGUI extends JFrame { try { if(am.addAdditionRequest(rh)){ + am.saveInstance(); feedback.setText("Request sended"); }else{ feedback.setText("Request cannot be sended(Already added)"); diff --git a/ruralHouses/src/businessLogic/AdminManager.java b/ruralHouses/src/businessLogic/AdminManager.java index f2790a9..9c562fd 100644 --- a/ruralHouses/src/businessLogic/AdminManager.java +++ b/ruralHouses/src/businessLogic/AdminManager.java @@ -5,9 +5,9 @@ import java.rmi.server.UnicastRemoteObject; import java.util.Vector; import common.AdminInterface; - import domain.Account; import domain.Administrator; +import domain.Owner; import domain.RuralHouse; public class AdminManager extends UnicastRemoteObject implements AdminInterface { @@ -66,10 +66,12 @@ public class AdminManager extends UnicastRemoteObject implements AdminInterface } - - public boolean addAccount(Account acc) throws RemoteException { + public boolean addAccountRequest(String usr, + String pss, Owner ow) throws RemoteException { + + Account acc = new Account (usr, pss, ow); if (this.getOwnerAdditionRequests().contains(acc)) { return false; } @@ -84,6 +86,7 @@ public class AdminManager extends UnicastRemoteObject implements AdminInterface + // public boolean removeAccount(Account acc) { // if (this.getDeletionRequests().contains(acc)) // return false; diff --git a/ruralHouses/src/businessLogic/HouseManager.java b/ruralHouses/src/businessLogic/HouseManager.java index cd3f11e..aca30dc 100644 --- a/ruralHouses/src/businessLogic/HouseManager.java +++ b/ruralHouses/src/businessLogic/HouseManager.java @@ -57,7 +57,7 @@ public class HouseManager extends UnicastRemoteObject implements HouseInterface public Vector getHouses(String name,String town, int nBed, int nKit, int nBath, int nPark, int nLiv) { - return this.dbMngr.getRuralHouses(name ,town, nBed, nKit, nBath, nPark, nLiv); + return this.dbMngr.getRuralHouses( name ,town, nBed, nKit, nBath, nPark, nLiv); } @Override diff --git a/ruralHouses/src/businessLogic/OfferManager.java b/ruralHouses/src/businessLogic/OfferManager.java index e3b1739..d3b2a87 100644 --- a/ruralHouses/src/businessLogic/OfferManager.java +++ b/ruralHouses/src/businessLogic/OfferManager.java @@ -3,9 +3,9 @@ package businessLogic; import java.rmi.RemoteException; import java.rmi.server.UnicastRemoteObject; import java.sql.Date; +import java.util.Vector; import common.OfferInterface; - import dataAccess.DB4oManager; import domain.Offer; import domain.RuralHouse; @@ -59,4 +59,13 @@ public final class OfferManager extends UnicastRemoteObject implements OfferInte dbMngr.deleteOffer( o); } + + + @Override + public Vector getRuralHouseOffers(RuralHouse rh) + throws RemoteException { + // TODO Auto-generated method stub + return null; + } + } diff --git a/ruralHouses/src/common/AdminInterface.java b/ruralHouses/src/common/AdminInterface.java index eb5e888..c45a81c 100644 --- a/ruralHouses/src/common/AdminInterface.java +++ b/ruralHouses/src/common/AdminInterface.java @@ -5,6 +5,7 @@ import java.rmi.RemoteException; import java.util.Vector; import domain.Account; +import domain.Owner; import domain.RuralHouse; public interface AdminInterface extends Remote { @@ -26,7 +27,8 @@ public interface AdminInterface extends Remote { public boolean addDeletionRequest(RuralHouse rh) throws RemoteException ; - public boolean addAccount(Account acc) throws RemoteException ; + public boolean addAccountRequest(String usr, + String pss, Owner ow) throws RemoteException; public void saveInstance() throws RemoteException; diff --git a/ruralHouses/src/common/OfferInterface.java b/ruralHouses/src/common/OfferInterface.java index 6e3b9b3..ccf03b5 100644 --- a/ruralHouses/src/common/OfferInterface.java +++ b/ruralHouses/src/common/OfferInterface.java @@ -3,6 +3,7 @@ package common; import java.rmi.Remote; import java.rmi.RemoteException; import java.sql.Date; +import java.util.Vector; import domain.Offer; import domain.RuralHouse; @@ -25,5 +26,7 @@ public interface OfferInterface extends Remote { public void deleteOffer(RuralHouse rh, Offer o) throws RemoteException, Exception; + + public Vector getRuralHouseOffers(RuralHouse rh)throws RemoteException; } diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java index b0513ae..096a17b 100644 --- a/ruralHouses/src/dataAccess/DB4oManager.java +++ b/ruralHouses/src/dataAccess/DB4oManager.java @@ -138,7 +138,6 @@ public class DB4oManager { Account admin = new Account("admin", "admin", true); db.store(Administrator.getInstance()); - db.store(jonAcc); db.store(alfredoAcc); db.store(admin); diff --git a/ruralHouses/src/domain/Districs.java b/ruralHouses/src/domain/Districs.java index db62454..2866692 100644 --- a/ruralHouses/src/domain/Districs.java +++ b/ruralHouses/src/domain/Districs.java @@ -7,12 +7,12 @@ public enum Districs implements Serializable { /** * */ - BEA("Beatriz"), GUA("Guazate"), VEG("Vegas"), FAR("Farallón"), CED("Cedro"), MOT( - "Monte LLano"), RIN("Rincón"), PUE("Pueblo"), QUA("Quebrada Arriba"), QEB( - "Quebrada Abajo"), TOI("Toita"), MAB("Matón Abajo"), MAA( - "Matón Arriba"), PIE("Piedras"), PAV("Pasto Viejo"), PEA( + BEA("Beatriz"), GUA("Guazate"), VEG("Vegas"), FAR("Farallón"), CED("Cedro"), MOT( + "Monte LLano"), RIN("Rincón"), PUE("Pueblo"), QUA("Quebrada Arriba"), QEB( + "Quebrada Abajo"), TOI("Toita"), MAB("Matón Abajo"), MAA( + "Matón Arriba"), PIE("Piedras"), PAV("Pasto Viejo"), PEA( "PedroAvila"), SUM("Sumido"), LAP("Lapa"), CER("Cercadillo"), JAJ( - "JájomeAlto"), CUL("CulebrasAbajo"); + "JójomeAlto"), CUL("CulebrasAbajo"); private static final long serialVersionUID = 1L;