projects
/
RRRRHHHH_Code
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implemented lacking GUIs and corrected errors
[RRRRHHHH_Code]
/
ruralHouses
/
src
/
gui
/
LoginGUI.java
diff --git
a/ruralHouses/src/gui/LoginGUI.java
b/ruralHouses/src/gui/LoginGUI.java
index
ef333d6
..
caeb1cd
100644
(file)
--- a/
ruralHouses/src/gui/LoginGUI.java
+++ b/
ruralHouses/src/gui/LoginGUI.java
@@
-60,6
+60,7
@@
public class LoginGUI extends JFrame {
JButton loginButton = new JButton("Login");
loginButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
JButton loginButton = new JButton("Login");
loginButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
+
jButton_ActionPerformed(arg0);
}
});
jButton_ActionPerformed(arg0);
}
});
@@
-80,20
+81,13
@@
public class LoginGUI extends JFrame {
if(owner==null){
loginFeedback.setText("Incorrect username or password");
}else{
if(owner==null){
loginFeedback.setText("Incorrect username or password");
}else{
- Vector<RuralHouse> ownerHouseList=null;
- try{
- ownerHouseList = StartWindow.getBusinessLogic().getRuralHouses(owner);
- }catch (Exception e1){
- e1.printStackTrace();
- }
- if(!ownerHouseList.isEmpty()){
+
+
+
this.setVisible(false);
this.setVisible(false);
- Frame a = new
IntroduceOffer2GUI(ownerHouseList
);
+ Frame a = new
OwnerMenuGUI(owner
);
a.setVisible(true);
a.setVisible(true);
- }
- else if(ownerHouseList.isEmpty())
- loginFeedback.setText("Login OK , but no houses in your name");
- }
+ }
}
}