Commit 01dfff9b authored by Hellmich, Christoph's avatar Hellmich, Christoph
Browse files

Resolve conflicts

parents 66c717a1 cecef8f5

.jhipster/Step.json

+1 −6
Original line number Diff line number Diff line
@@ -26,16 +26,11 @@ 
    },

    {

      "fieldId": 2,

      "fieldName": "description",

      "fieldType": "String"

    },

    {

      "fieldId": 3,

      "fieldName": "treeRow",

      "fieldType": "Integer"

    },

    {

      "fieldId": 4,

      "fieldId": 3,

      "fieldName": "treeIndent",

      "fieldType": "Integer"

    }

doc/class_diagram.png

−1.82 KiB (163 KiB)
Loading image diff...

entities.jh

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ entity Wizard { 


entity Step {

  name String required,

  description String,

  treeRow Integer,

  treeIndent Integer

}

src/main/java/org/gesis/dda/wizard/domain/Step.java

+0 −12
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ public class Step implements Serializable { 
    @Column(name = "name", nullable = false)

    private String name;



    @Column(name = "description")

    private String description;



    @Column(name = "tree_row")

    private Integer treeRow;
@@ -68,14 +65,6 @@ public class Step implements Serializable { 
        this.name = name;

    }



    public String getDescription() {

        return description;

    }



    public void setDescription(String description) {

        this.description = description;

    }



    public Integer getTreeRow() {

        return treeRow;

    }
@@ -141,7 +130,6 @@ public class Step implements Serializable { 
        return "Step{" +

            "id=" + id +

            ", name='" + name + "'" +

            ", description='" + description + "'" +

            ", treeRow='" + treeRow + "'" +

            ", treeIndent='" + treeIndent + "'" +

            '}';

src/main/java/org/gesis/dda/wizard/repository/StepRepository.java

+2 −3
Original line number Diff line number Diff line 
package org.gesis.dda.wizard.repository;



import org.gesis.dda.wizard.domain.Step;



import org.springframework.data.jpa.repository.*;

import org.springframework.data.jpa.repository.JpaRepository;



import java.util.List;