DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests8 Actions Projects1 Releases Wiki Activity

fixed some merge errors caused by generic data table moved to another package

Browse Source
This commit is contained in:
Emil Siverhall 2012-07-26 10:36:43 +02:00
parent 61b2180fb3
commit d38f5104c1
2 changed files with 2 additions and 3 deletions
src/main/java/se/su/dsv/scipro
project/panels
ProjectIdeaOverviewPanel.java
supervisor/panels
SupervisorProjectIdeaOverviewPanel.java

2
src/main/java/se/su/dsv/scipro/project/panels/ProjectIdeaOverviewPanel.java

@ -20,7 +20,7 @@ import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.datatables.ClickableTitleColumn;
import se.su.dsv.scipro.datatables.project.GenericDataPanel;
import se.su.dsv.scipro.datatables.GenericDataPanel;
import se.su.dsv.scipro.match.dataobject.Idea.IdeaStatus;
import se.su.dsv.scipro.match.dataobject.SupervisorIdea;
import se.su.dsv.scipro.match.panel.FilterFormProjectClass;

3
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaOverviewPanel.java

@ -20,11 +20,10 @@ import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.datatables.ClickableIconColumn;
import se.su.dsv.scipro.datatables.ClickableTitleColumn;
import se.su.dsv.scipro.datatables.project.GenericDataPanel;
import se.su.dsv.scipro.datatables.GenericDataPanel;
import se.su.dsv.scipro.icons.ImageIcon;
import se.su.dsv.scipro.match.dataobject.SupervisorIdea;
import se.su.dsv.scipro.match.panel.FilterFormProjectClass;
import se.su.dsv.scipro.project.panels.AcceptIdeaDialogPanel;
import se.su.dsv.scipro.springdata.services.GenericService;
import se.su.dsv.scipro.springdata.services.SupervisorIdeaService;
import se.su.dsv.scipro.springdata.services.SupervisorService;