2211482
/
PR2-travelbuddyapp
0
1
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix_branch'

main
Selim Eser 2024-06-18 18:13:45 +02:00
parent b92c488768 af6e9669b4
commit 11797b9b73
1 changed files with 58 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
src/main/java/de/hs_mannheim/ui/Main.java
View File

@ -61,7 +61,6 @@ public class Main extends JFrame {
private JButton changeDetailsButton; private JButton changeDetailsButton;
private JButton logOutButton; private JButton logOutButton;
private JScrollPane jsp = new JScrollPane(); private JScrollPane jsp = new JScrollPane();
private JPanel destinationButtons = new JPanel();
private JPanel changePassword; private JPanel changePassword;
private JLabel changePasswordLabel; private JLabel changePasswordLabel;
@ -104,6 +103,7 @@ public class Main extends JFrame {
panelLayout.setLayout(cardLayout); panelLayout.setLayout(cardLayout);
jframe.setDefaultCloseOperation(DISPOSE_ON_CLOSE); jframe.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
// => Hauptmenü Fenster
GridBagLayout gbl1 = new GridBagLayout(); GridBagLayout gbl1 = new GridBagLayout();
GridBagConstraints gbc1 = new GridBagConstraints(); GridBagConstraints gbc1 = new GridBagConstraints();
logRegScreen = new JPanel(gbl1); logRegScreen = new JPanel(gbl1);
@ -125,6 +125,8 @@ public class Main extends JFrame {
gbc1.insets = new Insets(10,0,20,0); gbc1.insets = new Insets(10,0,20,0);
logRegScreen.add(p1,gbc1); logRegScreen.add(p1,gbc1);
// => Einloggen Fenster
GridBagLayout gbl2 = new GridBagLayout(); GridBagLayout gbl2 = new GridBagLayout();
GridBagConstraints gbc2 = new GridBagConstraints(); GridBagConstraints gbc2 = new GridBagConstraints();
loginScreen = new JPanel(); loginScreen = new JPanel();
@ -160,6 +162,7 @@ public class Main extends JFrame {
cnt2.add(loginConfirmButton); cnt2.add(loginConfirmButton);
loginScreen.add(cnt2,gbc2); loginScreen.add(cnt2,gbc2);
// => Registrieren Fenster
GridBagLayout gbl3 = new GridBagLayout(); GridBagLayout gbl3 = new GridBagLayout();
GridBagConstraints gbc3 = new GridBagConstraints(); GridBagConstraints gbc3 = new GridBagConstraints();
registerScreen = new JPanel(gbl3); registerScreen = new JPanel(gbl3);
@ -207,6 +210,8 @@ public class Main extends JFrame {
p3.add(registerConfirmButton); p3.add(registerConfirmButton);
registerScreen.add(p3,gbc3); registerScreen.add(p3,gbc3);
// => Such Fenster
menu = new JPanel(new BorderLayout()); menu = new JPanel(new BorderLayout());
menuLabel = new JLabel("Travel-Buddy-App"); menuLabel = new JLabel("Travel-Buddy-App");
menuLabel.setFont(new Font("Arial", Font.PLAIN, 24)); menuLabel.setFont(new Font("Arial", Font.PLAIN, 24));
@ -217,45 +222,25 @@ public class Main extends JFrame {
logOutButtonCreate(); logOutButtonCreate();
changeDetailsButtonCreate(); changeDetailsButtonCreate();
changePasswordButtonCreate(); changePasswordButtonCreate();
//menuLabel.setBounds(140, -125, 300, 300);
//searchPLZ_ORT.setBounds(20, 50, 300, 100);
//searchConfirmButton.setBounds(346, 70, 110, 30);
//randDestinationsCarButton.setBounds(346, 105, 110, 30);
//randDestinationsBikeButton.setBounds(346, 140, 110, 30);
//logOutButton.setBounds(340, 430, 130, 30);
//changeDetailsButton.setBounds(340, 398, 130, 30);
//changePasswordButton.setBounds(340, 366, 130, 30);
leftSide.setLayout(new BoxLayout(leftSide,BoxLayout.Y_AXIS)); leftSide.setLayout(new BoxLayout(leftSide,BoxLayout.Y_AXIS));
rightSide.setLayout(new BoxLayout(rightSide,BoxLayout.Y_AXIS)); rightSide.setLayout(new BoxLayout(rightSide,BoxLayout.Y_AXIS));
gbc5.gridheight = 1;
gbc5.ipady = 0;
gbc5.ipadx = 0;
gbc5.gridx = 0;
gbc5.gridy = 0;
leftSide.add(Box.createRigidArea(new Dimension(0,25))); leftSide.add(Box.createRigidArea(new Dimension(0,25)));
menuLabel.setAlignmentX(Component.CENTER_ALIGNMENT); menuLabel.setAlignmentX(Component.CENTER_ALIGNMENT);
leftSide.add(menuLabel,1); leftSide.add(menuLabel,1);
gbc5.gridy = 1;
searchPLZ_ORT.setAlignmentX(Component.CENTER_ALIGNMENT); searchPLZ_ORT.setAlignmentX(Component.CENTER_ALIGNMENT);
searchPLZ_ORT.setMaximumSize(new Dimension(250,55)); searchPLZ_ORT.setMaximumSize(new Dimension(250,55));
searchPLZ_ORT.setPreferredSize(new Dimension(250,55)); searchPLZ_ORT.setPreferredSize(new Dimension(250,55));
leftSide.add(searchPLZ_ORT,2); leftSide.add(searchPLZ_ORT,2);
gbc5.gridy = 2;
jsp.setAlignmentX(Component.CENTER_ALIGNMENT); jsp.setAlignmentX(Component.CENTER_ALIGNMENT);
jsp.setMaximumSize(new Dimension(250, 500)); jsp.setMaximumSize(new Dimension(250, 500));
jsp.setPreferredSize(new Dimension(250, 500)); jsp.setPreferredSize(new Dimension(250, 500));
leftSide.add(jsp,3); leftSide.add(jsp,3);
gbc5.gridheight = 1;
gbc5.ipady = 0;
gbc5.ipadx = 0;
gbc5.gridx = 1;
gbc5.gridy = 1;
rightSide.add(Box.createRigidArea(new Dimension(0,80))); rightSide.add(Box.createRigidArea(new Dimension(0,80)));
searchConfirmButton.setAlignmentX(Component.CENTER_ALIGNMENT); searchConfirmButton.setAlignmentX(Component.CENTER_ALIGNMENT);
@ -263,41 +248,35 @@ public class Main extends JFrame {
searchConfirmButton.setPreferredSize(new Dimension(140,35)); searchConfirmButton.setPreferredSize(new Dimension(140,35));
rightSide.add(searchConfirmButton,1); rightSide.add(searchConfirmButton,1);
gbc5.gridy = 2;
randDestinationsCarButton.setAlignmentX(Component.CENTER_ALIGNMENT); randDestinationsCarButton.setAlignmentX(Component.CENTER_ALIGNMENT);
randDestinationsCarButton.setMaximumSize(new Dimension(140,35)); randDestinationsCarButton.setMaximumSize(new Dimension(140,35));
randDestinationsCarButton.setPreferredSize(new Dimension(140,35)); randDestinationsCarButton.setPreferredSize(new Dimension(140,35));
rightSide.add(randDestinationsCarButton,2); rightSide.add(randDestinationsCarButton,2);
gbc5.gridy = 3;
randDestinationsBikeButton.setAlignmentX(Component.CENTER_ALIGNMENT); randDestinationsBikeButton.setAlignmentX(Component.CENTER_ALIGNMENT);
randDestinationsBikeButton.setMaximumSize(new Dimension(140,35)); randDestinationsBikeButton.setMaximumSize(new Dimension(140,35));
randDestinationsBikeButton.setPreferredSize(new Dimension(140,35)); randDestinationsBikeButton.setPreferredSize(new Dimension(140,35));
rightSide.add(randDestinationsBikeButton,3); rightSide.add(randDestinationsBikeButton,3);
gbc5.gridy = 4;
rightSide.add(Box.createRigidArea(new Dimension(0,230))); rightSide.add(Box.createRigidArea(new Dimension(0,230)));
profile.setAlignmentX(Component.CENTER_ALIGNMENT); profile.setAlignmentX(Component.CENTER_ALIGNMENT);
rightSide.add(profile,5); rightSide.add(profile,5);
gbc5.gridy = 5;
changeDetailsButton.setAlignmentX(Component.CENTER_ALIGNMENT); changeDetailsButton.setAlignmentX(Component.CENTER_ALIGNMENT);
changeDetailsButton.setMaximumSize(new Dimension(140,35)); changeDetailsButton.setMaximumSize(new Dimension(140,35));
changeDetailsButton.setPreferredSize(new Dimension(140,35)); changeDetailsButton.setPreferredSize(new Dimension(140,35));
rightSide.add(changeDetailsButton,6); rightSide.add(changeDetailsButton,6);
gbc5.gridy = 6;
changePasswordButton.setAlignmentX(Component.CENTER_ALIGNMENT); changePasswordButton.setAlignmentX(Component.CENTER_ALIGNMENT);
changePasswordButton.setMaximumSize(new Dimension(140,35)); changePasswordButton.setMaximumSize(new Dimension(140,35));
changePasswordButton.setPreferredSize(new Dimension(140,35)); changePasswordButton.setPreferredSize(new Dimension(140,35));
rightSide.add(changePasswordButton,7); rightSide.add(changePasswordButton,7);
gbc5.gridy = 7;
logOutButton.setAlignmentX(Component.CENTER_ALIGNMENT); logOutButton.setAlignmentX(Component.CENTER_ALIGNMENT);
logOutButton.setMaximumSize(new Dimension(140,35)); logOutButton.setMaximumSize(new Dimension(140,35));
@ -307,40 +286,9 @@ public class Main extends JFrame {
menu.add(leftSide,BorderLayout.WEST); menu.add(leftSide,BorderLayout.WEST);
menu.add(rightSide,BorderLayout.EAST); menu.add(rightSide,BorderLayout.EAST);
/*p4 = new JPanel(new GridLayout(4,1)); // => Passwort ändern Fenster
p4.add(menuLabel);
p4.add(searchPLZ_ORT);
p4.add(new JLabel());
//menu.add(menuLabel,gbc5);
gbc5.ipady = 20;
gbc5.ipadx = 20;
gbc5.gridy = 1;
gbc5.insets = new Insets(0, 0, 10, 20);
menu.add(p4,gbc5);
//menu.add(searchPLZ_ORT,gbc5);
gbc5.gridx = 2;
gbc5.gridy = 1;
gbc5.insets = new Insets(0, 10, 0, 0);
menu.add(searchConfirmButton,gbc5);
gbc5.gridy = 2;
gbc5.insets = new Insets(0, 10, 0, 0);
menu.add(randDestinationsCarButton,gbc5);
gbc5.gridy = 3;
gbc5.insets = new Insets(0, 10, 0, 0);
menu.add(randDestinationsBikeButton,gbc5);
gbc5.gridy = 7;
gbc5.insets = new Insets(0, 10, 0, 0);
menu.add(logOutButton,gbc5);
gbc5.gridy = 5;
gbc5.insets = new Insets(0, 10, 0, 0);
menu.add(changeDetailsButton,gbc5);
gbc5.gridy = 6;
gbc5.insets = new Insets(0, 10, 0, 0);
menu.add(changePasswordButton,gbc5);
gbc5.insets = new Insets(0, 0, 0, 0);
*/
changePassword = new JPanel(gbl5); changePassword = new JPanel(gbl5);
changePasswordLabel = new JLabel("Password ändern"); changePasswordLabel = new JLabel("Passwort ändern");
changePasswordLabel.setFont(new Font("Arial", Font.PLAIN, 24)); changePasswordLabel.setFont(new Font("Arial", Font.PLAIN, 24));
changePasswordOldPasswordCreate(); changePasswordOldPasswordCreate();
changePasswordNewPasswordCreate(); changePasswordNewPasswordCreate();
@ -376,13 +324,8 @@ public class Main extends JFrame {
gbc5.ipady = 10; gbc5.ipady = 10;
changePassword.add(p8,gbc5); changePassword.add(p8,gbc5);
/*changePassword.add(changePasswordLabel);
changePassword.add(changePasswordOldPassword);
changePassword.add(changePasswordNewPassword);
changePassword.add(changePasswordConfirmNewPassword);
changePassword.add(changePasswordBackButton);
changePassword.add(changePasswordConfirmButton);*/
// => Nutzerdaten ändern Fenster
changeDetails = new JPanel(gbl5); changeDetails = new JPanel(gbl5);
changeDetailsLabel = new JLabel("Nutzerdaten ändern"); changeDetailsLabel = new JLabel("Nutzerdaten ändern");
changeDetailsLabel.setFont(new Font("Arial", Font.PLAIN, 24)); changeDetailsLabel.setFont(new Font("Arial", Font.PLAIN, 24));
@ -406,11 +349,11 @@ public class Main extends JFrame {
gbc5.insets = new Insets(0,0,0,0); gbc5.insets = new Insets(0,0,0,0);
JPanel p5 = new JPanel(new GridLayout(8, 1,0,5)); JPanel p5 = new JPanel(new GridLayout(8, 1,0,5));
p5.add(changeName); p5.add(changeName);
p5.add(changeOrt);
p5.add(changePLZ); p5.add(changePLZ);
p5.add(changeOrt);
p5.add(changeCarName); p5.add(changeCarName);
p5.add(changeCarCO2);
p5.add(changeCarSpeed); p5.add(changeCarSpeed);
p5.add(changeCarCO2);
p5.add(changeBikeSpeed); p5.add(changeBikeSpeed);
p5.add(checkChangePassword); p5.add(checkChangePassword);
gbc5.gridx = 0; gbc5.gridx = 0;
@ -430,17 +373,7 @@ public class Main extends JFrame {
gbc5.ipady = 10; gbc5.ipady = 10;
changeDetails.add(p6,gbc5); changeDetails.add(p6,gbc5);
/*changeDetails.add(changeDetailsLabel); // cardLayout
changeDetails.add(changeName);
changeDetails.add(changeOrt);
changeDetails.add(changePLZ);
changeDetails.add(changeCarName);
changeDetails.add(changeCarCO2);
changeDetails.add(changeCarSpeed);
changeDetails.add(changeBikeSpeed);
changeDetails.add(checkChangePassword);
changeDetails.add(changeBackButton);
changeDetails.add(changeConfirmButton);*/
panelLayout.add(logRegScreen, "1"); panelLayout.add(logRegScreen, "1");
panelLayout.add(loginScreen, "2"); panelLayout.add(loginScreen, "2");
@ -462,27 +395,7 @@ public class Main extends JFrame {
JLabel jl = new JLabel(png); JLabel jl = new JLabel(png);
String[] details = facade.getDetails(); String[] details = facade.getDetails();
jp.setToolTipText("<html>Nutzername:<br>"+details[0]+"<br><br>Adresse:<br>"+details[2] + ", " + details[1]+"<br><br>Aktuelles Wetter:<br>"+facade.current_weather()+"</html>"); jp.setToolTipText("<html>Nutzername:<br>"+details[0]+"<br><br>Adresse:<br>"+details[2] + ", " + details[1]+"<br><br>Aktuelles Wetter:<br>"+facade.current_weather()+"</html>");
/*JLabel jlName = new JLabel("Nutzername:");
jlName.setToolTipText(details[0]);
JLabel jlNameText = new JLabel(details[0]);
JLabel jlWohnort = new JLabel("Adresse:");
jlWohnort.setToolTipText(details[2] + ", " + details[1]);
JLabel jlWohnortText = new JLabel(details[2] + ", " + details[1]);
JLabel jlWetter = new JLabel("Aktuelles Wetter:");
jlWetter.setToolTipText(facade.current_weather());
JLabel jlWetterText = new JLabel(facade.current_weather());
*/
jp.add(jl); jp.add(jl);
/*jp.add(new JLabel());
jp.add(jlName);
jp.add(jlNameText);
jp.add(new JLabel());
jp.add(jlWohnort);
jp.add(jlWohnortText);
jp.add(new JLabel());
jp.add(jlWetter);
jp.add(jlWetterText);
*/
profile = jp; profile = jp;
} }
@ -568,8 +481,7 @@ public class Main extends JFrame {
} }
profile.setMaximumSize(new Dimension(50,50)); profile.setMaximumSize(new Dimension(50,50));
profile.setPreferredSize(new Dimension(50,50)); profile.setPreferredSize(new Dimension(50,50));
gbc5.gridx = 1;
gbc5.gridy = 4;
rightSide.add(profile,5); rightSide.add(profile,5);
rightSide.revalidate(); rightSide.revalidate();
menu.revalidate(); menu.revalidate();
@ -708,8 +620,7 @@ public class Main extends JFrame {
} }
profile.setMaximumSize(new Dimension(50,50)); profile.setMaximumSize(new Dimension(50,50));
profile.setPreferredSize(new Dimension(50,50)); profile.setPreferredSize(new Dimension(50,50));
gbc5.gridx = 1;
gbc5.gridy = 4;
rightSide.add(profile,5); rightSide.add(profile,5);
rightSide.revalidate(); rightSide.revalidate();
menu.revalidate(); menu.revalidate();
@ -853,31 +764,24 @@ public class Main extends JFrame {
} }
}); });
destinationButtonsProxy.add(jb); destinationButtonsProxy.add(jb);
//JLabel placeholder = new JLabel("");
//destinationButtonsProxy.add(placeholder);
} }
destinationButtons = destinationButtonsProxy; destinationButtonsProxy.revalidate();
try { try {
leftSide.remove(jsp); leftSide.remove(jsp);
} catch (Exception jspNotYetIncluded) { } catch (Exception jspNotYetIncluded) {
} }
jsp = new JScrollPane(destinationButtons, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jsp = new JScrollPane(destinationButtonsProxy,
//jsp.setBounds(40, 110, 256, 336); JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
jsp.setMaximumSize(new Dimension(250, 450)); jsp.setMaximumSize(new Dimension(250, 450));
jsp.setPreferredSize(new Dimension(250, 450)); jsp.setPreferredSize(new Dimension(250, 450));
jsp.revalidate(); jsp.revalidate();
gbc5.gridx = 0;
gbc5.gridy = 2;
gbc5.gridheight = GridBagConstraints.RELATIVE;
//gbc5.ipady = 500;
//gbc5.ipadx = 200;
leftSide.add(jsp,3); leftSide.add(jsp,3);
leftSide.revalidate(); leftSide.revalidate();
gbc5.ipady = 0;
gbc5.ipadx = 0;
gbc5.gridheight = 1;
menu.revalidate(); menu.revalidate();
} }
else { else {
@ -885,27 +789,20 @@ public class Main extends JFrame {
JLabel jl = new JLabel("Ihre Suche liefert keine Treffer!"); JLabel jl = new JLabel("Ihre Suche liefert keine Treffer!");
jl.setFont(new Font("Arial", Font.PLAIN, 14)); jl.setFont(new Font("Arial", Font.PLAIN, 14));
destinationButtonsProxy.add(jl); destinationButtonsProxy.add(jl);
destinationButtons = destinationButtonsProxy; destinationButtonsProxy.revalidate();
destinationButtons.revalidate();
try { try {
leftSide.remove(jsp); leftSide.remove(jsp);
} catch (Exception jspNotYetIncluded) { } catch (Exception jspNotYetIncluded) {
} }
jsp = new JScrollPane(destinationButtons); jsp = new JScrollPane(destinationButtonsProxy);
jsp.setMaximumSize(new Dimension(250, 450)); jsp.setMaximumSize(new Dimension(250, 450));
jsp.setPreferredSize(new Dimension(250, 450)); jsp.setPreferredSize(new Dimension(250, 450));
jsp.revalidate(); jsp.revalidate();
gbc5.gridx = 0;
gbc5.gridy = 2;
gbc5.gridheight = GridBagConstraints.RELATIVE;
leftSide.add(jsp,3); leftSide.add(jsp,3);
leftSide.revalidate(); leftSide.revalidate();
gbc5.gridheight = 1;
menu.revalidate(); menu.revalidate();
} }
} }
@ -1002,27 +899,21 @@ public class Main extends JFrame {
}); });
destinationButtonsProxy.add(jb); destinationButtonsProxy.add(jb);
} }
destinationButtons = destinationButtonsProxy; destinationButtonsProxy.revalidate();
destinationButtons.revalidate();
try { try {
leftSide.remove(jsp); leftSide.remove(jsp);
} catch (Exception jspNotYetIncluded) { } catch (Exception jspNotYetIncluded) {
} }
jsp = new JScrollPane(destinationButtons); jsp = new JScrollPane(destinationButtonsProxy);
jsp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jsp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
jsp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); jsp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
jsp.setMaximumSize(new Dimension(250, 450)); jsp.setMaximumSize(new Dimension(250, 450));
jsp.setPreferredSize(new Dimension(250, 450)); jsp.setPreferredSize(new Dimension(250, 450));
jsp.revalidate(); jsp.revalidate();
gbc5.gridx = 0;
gbc5.gridy = 2;
gbc5.gridheight = GridBagConstraints.RELATIVE;
leftSide.add(jsp,3); leftSide.add(jsp,3);
leftSide.revalidate(); leftSide.revalidate();
gbc5.gridheight = 1;
menu.revalidate(); menu.revalidate();
@ -1119,14 +1010,13 @@ public class Main extends JFrame {
}); });
destinationButtonsProxy.add(jb); destinationButtonsProxy.add(jb);
} }
destinationButtons = destinationButtonsProxy; destinationButtonsProxy.revalidate();
destinationButtons.revalidate();
try { try {
leftSide.remove(jsp); leftSide.remove(jsp);
} catch (Exception jspNotYetIncluded) { } catch (Exception jspNotYetIncluded) {
} }
jsp = new JScrollPane(destinationButtons); jsp = new JScrollPane(destinationButtonsProxy);
jsp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jsp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
jsp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); jsp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
jsp.setMaximumSize(new Dimension(250, 450)); jsp.setMaximumSize(new Dimension(250, 450));
@ -1134,13 +1024,8 @@ public class Main extends JFrame {
jsp.revalidate(); jsp.revalidate();
gbc5.gridx = 0;
gbc5.gridy = 2;
gbc5.gridheight = GridBagConstraints.RELATIVE;
leftSide.add(jsp,3); leftSide.add(jsp,3);
leftSide.revalidate(); leftSide.revalidate();
gbc5.gridheight = 1;
menu.revalidate(); menu.revalidate();
@ -1271,8 +1156,7 @@ public class Main extends JFrame {
carNameTXT, carCO2TXT, carSpeedTXT, bikeSpeedTXT)){ carNameTXT, carCO2TXT, carSpeedTXT, bikeSpeedTXT)){
rightSide.remove(5); rightSide.remove(5);
profileCreate(); profileCreate();
gbc5.gridx = 1;
gbc5.gridy = 4;
rightSide.add(profile,5); rightSide.add(profile,5);
rightSide.revalidate(); rightSide.revalidate();
menu.revalidate(); menu.revalidate();