Skip to content

Commit

Permalink
Merge pull request #171 from texx94/reformatGUI
Browse files Browse the repository at this point in the history
Reformat code for GUI Files
mtutic authored May 22, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 2ede6d0 + 6a345bc commit ca2934f
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/main/java/ch/heigvd/sitr/gui/settings/SettingsWindow.java
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ public void showWindow() {

/**
* Method used to get the selected scenario
*
* @return the selected scenario
*/
public Scenario getSelectedScenario() {
@@ -81,6 +82,7 @@ public int getNumberOfController(VehicleControllerType vct) {

/**
* Method used to get the selected behaviour of the simulation
*
* @return the selected behaviour
*/
public VehicleBehaviour getSelectedBehaviour() {
Original file line number Diff line number Diff line change
@@ -113,7 +113,7 @@ public void actionPerformed(ActionEvent e) {
this.add(colorChangeLabel, gbc);

colorChangeButton = new JButton();
colorChangeButton.setPreferredSize(new Dimension(25,25));
colorChangeButton.setPreferredSize(new Dimension(25, 25));
colorChangeButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -248,7 +248,8 @@ public void actionPerformed(ActionEvent e) {
/**
* Method used to update the observer. In this case, refresh the statistics of the
* selected car.
* @param o the selected car
*
* @param o the selected car
* @param arg param used to notify all observers of o (never used in this app)
*/
@Override
4 changes: 4 additions & 0 deletions src/main/java/ch/heigvd/sitr/gui/simulation/MapPanel.java
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@ public void mousePressed(MouseEvent e) {

/**
* Not Implemented
*
* @param e mouse event
*/
@Override
@@ -75,6 +76,7 @@ public void mouseClicked(MouseEvent e) {

/**
* Not Implemented
*
* @param e mouse event
*/
@Override
@@ -83,6 +85,7 @@ public void mouseReleased(MouseEvent e) {

/**
* Not Implemented
*
* @param e mouse event
*/
@Override
@@ -91,6 +94,7 @@ public void mouseEntered(MouseEvent e) {

/**
* Not Implemented
*
* @param e mouse event
*/
@Override

0 comments on commit ca2934f

Please sign in to comment.