Commit fb401659 authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merge branch '193-move-project-classes-to-project-package' into 'master' 

moved project files to separate package

Closes #193

See merge request grp-fidentis/analyst2!206
parents 60f0ac1d 173c3b14

Comparison/src/main/java/cz/fidentis/analyst/Project.java→Comparison/src/main/java/cz/fidentis/analyst/project/Project.java

+2 −1
Original line number Diff line number Diff line 
package cz.fidentis.analyst;

package cz.fidentis.analyst.project;



import cz.fidentis.analyst.face.HumanFace;

import java.io.File;
@@ -6,6 +6,7 @@ import java.io.IOException; 
import java.nio.file.Path;

import java.util.prefs.Preferences;

import com.fasterxml.jackson.databind.ObjectMapper;

import cz.fidentis.analyst.Logger;

import java.nio.file.Paths;

Comparison/src/main/java/cz/fidentis/analyst/ProjectConfiguration.java→Comparison/src/main/java/cz/fidentis/analyst/project/ProjectConfiguration.java

+1 −1
Original line number Diff line number Diff line 
package cz.fidentis.analyst;

package cz.fidentis.analyst.project;



import java.io.File;

import java.nio.file.Path;

GUI/src/main/java/cz/fidentis/analyst/core/FaceTab.java

+1 −1
Original line number Diff line number Diff line 
package cz.fidentis.analyst.core;



import cz.fidentis.analyst.Project;

import cz.fidentis.analyst.project.Project;

import cz.fidentis.analyst.batch.BatchAction;

import cz.fidentis.analyst.canvas.Canvas;

import cz.fidentis.analyst.canvas.toolbar.SceneToolboxFaceToFace;

GUI/src/main/java/cz/fidentis/analyst/faceState/FaceStatePanel.java

+1 −1
Original line number Diff line number Diff line 
package cz.fidentis.analyst.faceState;



import cz.fidentis.analyst.Project;

import cz.fidentis.analyst.project.Project;

import cz.fidentis.analyst.core.ControlPanel;

import cz.fidentis.analyst.face.HumanFace;

import java.awt.Dimension;

GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java

+0 −1
Original line number Diff line number Diff line 
package cz.fidentis.analyst.project;



import cz.fidentis.analyst.faceState.FaceStatePanel;

import cz.fidentis.analyst.Project;

import cz.fidentis.analyst.core.FaceTab;

import cz.fidentis.analyst.core.ProgressDialog;

import cz.fidentis.analyst.face.HumanFace;