package de.unibremen.opensores.model;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;

/**
 * Entity bean for the Semester class.
 */
@Entity
@Table(name = "SEMESTERS")
public class Semester {

    @Id
    @GeneratedValue
    private Long semesterId;

    @Column(nullable = false)
    private String name;

    @Column(nullable = false)
    private Boolean isWinter;

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public Boolean isWinter() {
        return isWinter;
    }

    public void setIsWinter(Boolean winter) {
        isWinter = winter;
    }

    public Long getSemesterId() {
        return semesterId;
    }

    @Override
    public boolean equals(Object obj) {
        if (obj instanceof Semester) {
            return ((Semester) obj).getSemesterId().equals(semesterId);
        }

        return false;
    }

    @Override
    public String toString() {
        if (name == null) {
            return null;
        }

        return name + " " + ((isWinter) ? "WiSe" : "SoSe");
    }
}

@@ -829,213 +829,8 @@
  %7D%0A%0A
-    @Override%0A    public boolean equals(Object obj) %7B%0A        if (obj instanceof Semester) %7B%0A            return ((Semester) obj).getSemesterId().equals(semesterId);%0A        %7D%0A%0A        return false;%0A    %7D%0A%0A
     
@@ -866,24 +866,24 @@
 oString() %7B%0A
+
         if (
@@ -952,21 +952,8 @@
 turn
- name + %22 %22 +
  ((i
@@ -979,16 +979,29 @@
  %22SoSe%22)
+ + %22 %22 + name
 ;%0A    %7D%0A

Fix merge conflicts.