diff --git a/populator/.DS_Store b/populator/.DS_Store
index ac821b2..1bb713b 100644
Binary files a/populator/.DS_Store and b/populator/.DS_Store differ
diff --git a/populator/.classpath b/populator/.classpath
index d8a92b2..ef5b0fa 100644
--- a/populator/.classpath
+++ b/populator/.classpath
@@ -4,6 +4,9 @@
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
diff --git a/populator/jgoodies-forms-1.8.0-sources.jar b/populator/jgoodies-forms-1.8.0-sources.jar
deleted file mode 100644
index 822eb93..0000000
Binary files a/populator/jgoodies-forms-1.8.0-sources.jar and /dev/null differ
diff --git a/populator/jgoodies-forms-1.8.0.jar b/populator/jgoodies-forms-1.8.0.jar
deleted file mode 100644
index a6a8126..0000000
Binary files a/populator/jgoodies-forms-1.8.0.jar and /dev/null differ
diff --git a/populator/miglayout-src.zip b/populator/miglayout-src.zip
deleted file mode 100644
index 9c51c32..0000000
Binary files a/populator/miglayout-src.zip and /dev/null differ
diff --git a/populator/miglayout15-swing.jar b/populator/miglayout15-swing.jar
deleted file mode 100644
index 2d6a62f..0000000
Binary files a/populator/miglayout15-swing.jar and /dev/null differ
diff --git a/populator/src/GUI.java b/populator/src/GUI.java
index 846a03b..7fccbd2 100644
--- a/populator/src/GUI.java
+++ b/populator/src/GUI.java
@@ -13,16 +13,34 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JLabel;
+<<<<<<< Updated upstream
import javax.swing.JDesktopPane;
import javax.swing.JPanel;
+=======
+import com.jgoodies.forms.layout.FormLayout;
+import com.jgoodies.forms.layout.ColumnSpec;
+import com.jgoodies.forms.layout.RowSpec;
+import javax.swing.JTextField;
+import java.awt.Font;
+>>>>>>> Stashed changes
import java.awt.Color;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
public class GUI {
+ public static String IP;
+ public static String username;
+ public static String password;
+
static JFrame frame;
+<<<<<<< Updated upstream
static JTextArea textArea;
+=======
+ private JTextField IPText;
+ private JTextField usernameText;
+ private JTextField passwordText;
+>>>>>>> Stashed changes
/**
* Create the application.
*/
@@ -38,7 +56,9 @@ private void initialize() {
frame.setSize(new Dimension(752, 502));
//frame.setSize(500,500);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().setLayout(null);
+<<<<<<< Updated upstream
JDesktopPane desktopPane_2 = new JDesktopPane();
frame.getContentPane().add(desktopPane_2, BorderLayout.NORTH);
@@ -74,5 +94,62 @@ public void run() {
private static void addPopup(Component component, final JPopupMenu popup) {
//probably use this to show an error messsage
+=======
+
+
+
+ JLabel lblNewLabel = new JLabel("Username:");
+ lblNewLabel.setFont(new Font("Lucida Grande", Font.PLAIN, 20));
+ lblNewLabel.setBounds(123, 211, 117, 29);
+ frame.getContentPane().add(lblNewLabel);
+
+ JLabel lblNewLabel_1 = new JLabel("Password:");
+ lblNewLabel_1.setFont(new Font("Lucida Grande", Font.PLAIN, 20));
+ lblNewLabel_1.setBounds(123, 258, 123, 29);
+ frame.getContentPane().add(lblNewLabel_1);
+
+ JLabel lblNewLabel_2 = new JLabel("IP Address:");
+ lblNewLabel_2.setFont(new Font("Lucida Grande", Font.PLAIN, 20));
+ lblNewLabel_2.setBounds(123, 161, 117, 29);
+ frame.getContentPane().add(lblNewLabel_2);
+
+ JLabel lblNewLabel_3 = new JLabel("Mysql Server");
+ lblNewLabel_3.setFont(new Font("Lucida Grande", Font.PLAIN, 40));
+ lblNewLabel_3.setBounds(241, 19, 281, 80);
+ frame.getContentPane().add(lblNewLabel_3);
+
+ IPText = new JTextField();
+ IPText.setBounds(314, 165, 130, 26);
+ frame.getContentPane().add(IPText);
+ IPText.setColumns(10);
+
+ usernameText = new JTextField();
+ usernameText.setBounds(314, 215, 130, 26);
+ frame.getContentPane().add(usernameText);
+ usernameText.setColumns(10);
+
+ passwordText = new JTextField();
+ passwordText.setBounds(314, 262, 130, 26);
+ frame.getContentPane().add(passwordText);
+ passwordText.setColumns(10);
+
+ JButton loginButton = new JButton("Login");
+ loginButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ IP=IPText.getText();
+ username=usernameText.getText();
+ password=passwordText.getText();
+ }
+
+ });
+
+ loginButton.setBackground(Color.WHITE);
+ loginButton.setBounds(279, 394, 117, 29);
+ frame.getContentPane().add(loginButton);
+
+ }
+
+ private static void addPopup(Component component, final JPopupMenu popup) {
+>>>>>>> Stashed changes
}
}
diff --git a/populator/src/testingBranchingongit.java b/populator/src/testingBranchingongit.java
deleted file mode 100644
index b3e62b1..0000000
--- a/populator/src/testingBranchingongit.java
+++ /dev/null
@@ -1,4 +0,0 @@
-
-public class testingBranchingongit {
-
-}
diff --git a/stuff todo to not lose hannahs work on git.txt b/stuff todo to not lose hannahs work on git.txt
new file mode 100644
index 0000000..fab9a0c
--- /dev/null
+++ b/stuff todo to not lose hannahs work on git.txt
@@ -0,0 +1,24 @@
+things to do so that hannahs changes are not lost
+
+git stash
+to stash her changes so that we dont lose them
+
+git pull origin master
+to update her local repo
+
+git checkout hannah
+to swith to her branch
+
+git apply
+to apply the stashed changes to her branch
+
+git add
+add her changes to be commited
+
+git coomit -m
+to commit her changes
+
+git push origin hannah
+to push her changes to her branch then merge later on
+
+