martins/FIprojetIHM2022
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

debut de la fin des changements, modif api et correction de bug

Browse Source
This commit is contained in:
Clément MARTINS
2022-12-02 11:20:58 +01:00
parent 35696d3b14
commit 1fb3e881dc
24 changed files with 529 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
java/APIGroupe/Makefile
View File

@@ -24,7 +24,7 @@ run : build\
# AUTRE BUTS
doc :
javadoc -d doc src/fr/iutfbleau/projetIHM2022FI2/API/*.java src/fr/iutfbleau/projetIHM2022FI2/MNP/*.java src/fr/iutfbleau/projetIHM2022FI2/ROOT/Controller/*.java src/fr/iutfbleau/projetIHM2022FI2/ROOT/View/*.java
javadoc -d doc src/fr/iutfbleau/projetIHM2022FI2/API/*.java src/fr/iutfbleau/projetIHM2022FI2/MNP/*.java src/fr/iutfbleau/projetIHM2022FI2/ROOT/Controller/*.java src/fr/iutfbleau/projetIHM2022FI2/ROOT/View/*.java src/fr/iutfbleau/projetIHM2022FI2/ETU/Controller/*.java src/fr/iutfbleau/projetIHM2022FI2/ETU/View/*.java src/fr/iutfbleau/projetIHM2022FI2/ETU/Model/*.java src/fr/iutfbleau/projetIHM2022FI2/ROOTw/Model/*.java
clean :
rm -rf ${BUILD}/* *.jar
@@ -35,6 +35,9 @@ clean :
build :
mkdir build
## API ##
${BUILD}/API/Model.class : ${SRC}/API/Model.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/API/Model.java
${BUILD}/API/MonPrint.class : ${SRC}/API/MonPrint.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/API/MonPrint.java
@@ -94,28 +97,22 @@ ${BUILD}/MNP/AbstractChangementFactoryNP.class : ${SRC}/MNP/AbstractChangementFa
${BUILD}/API/Changement.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/MNP/AbstractChangementFactoryNP.java
## ROOT ##
## View ##
${BUILD}/ROOT/View/FenetreGroupe.class : ${SRC}/ROOT/View/FenetreGroupe.java \
${BUILD}/ROOT/Controller/ObservateurFenetre.class \
${BUILD}/ROOT/Controller/ObservateurChangeGroupe.class \
${BUILD}/Permanent/Controller/ObservateurFenetre.class \
${BUILD}/Permanent/Controller/ObservateurChangeGroupe.class \
${BUILD}/ROOT/Controller/ObservateurModifGroupe.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/View/FenetreGroupe.java
${BUILD}/ROOT/View/FenetreEtudiant.class :${SRC}/ROOT/View/FenetreEtudiant.java \
${BUILD}/ROOT/Controller/ObservateurFenetre.class \
${BUILD}/ROOT/Controller/ObservateurChangeGroupe.class \
${BUILD}/Permanent/Controller/ObservateurFenetre.class \
${BUILD}/Permanent/Controller/ObservateurChangeGroupe.class \
${BUILD}/ROOT/View/PanelEtudiant.class \
${BUILD}/ROOT/Controller/ActionListenerChangeEtu.class
${BUILD}/Permanent/Controller/ActionListenerChangeEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/View/FenetreEtudiant.java
${BUILD}/ROOT/View/PanelEtudiant.class : ${SRC}/ROOT/View/PanelEtudiant.java \
@@ -130,24 +127,16 @@ ${BUILD}/ROOT/View/FenetreSelectionEtu.class : ${SRC}/ROOT/View/FenetreSelection
## Controller ##
${BUILD}/ROOT/Controller/ActionListenerChangeEtu.class : ${SRC}/ROOT/Controller/ActionListenerChangeEtu.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ActionListenerChangeEtu.java
${BUILD}/ROOT/Controller/ActionListenerSuprEtu.class : ${SRC}/ROOT/Controller/ActionListenerSuprEtu.java \
${BUILD}/API/Etudiant.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ActionListenerSuprEtu.java
${BUILD}/ROOT/Controller/ObservateurFenetre.class : ${SRC}/ROOT/Controller/ObservateurFenetre.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ObservateurFenetre.java
${BUILD}/ROOT/Controller/ObservateurModifGroupe.class : ${SRC}/ROOT/Controller/ObservateurModifGroupe.java \
${BUILD}/ROOT/View/FenetreSelectionEtu.class \
${BUILD}/ROOT/Controller/SelecteurEtudiant.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ObservateurModifGroupe.java
${BUILD}/ROOT/Controller/ObservateurChangeGroupe.class : ${SRC}/ROOT/Controller/ObservateurChangeGroupe.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ObservateurChangeGroupe.java
${BUILD}/ROOT/Controller/SelecteurEtudiant.class : ${SRC}/ROOT/Controller/SelecteurEtudiant.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/SelecteurEtudiant.java
@@ -160,11 +149,12 @@ ${BUILD}/ROOT/Controller/ActionListenerNouveauEtu.class : ${SRC}/ROOT/Controller
##  Model ###
${BUILD}/ROOT/Model/Model.class : ${SRC}/ROOT/Model/Model.java \
${BUILD}/ROOT/Model/ModelRoot.class : ${SRC}/ROOT/Model/ModelRoot.java \
${BUILD}/API/Model.class \
${BUILD}/ROOT/View/FenetreGroupe.class \
${BUILD}/ROOT/View/FenetreEtudiant.class \
${BUILD}/Permanent/View/Chargement.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Model/Model.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Model/ModelRoot.java
@@ -177,15 +167,15 @@ ${BUILD}/ROOT/Model/Model.class : ${SRC}/ROOT/Model/Model.java \
## View ##
${BUILD}/ETU/View/FenetreGroupe.class : ${SRC}/ETU/View/FenetreGroupe.java \
${BUILD}/ETU/Controller/ObservateurFenetre.class \
${BUILD}/ETU/Controller/ObservateurChangeGroupe.class
${BUILD}/Permanent/Controller/ObservateurFenetre.class \
${BUILD}/Permanent/Controller/ObservateurChangeGroupe.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/View/FenetreGroupe.java
${BUILD}/ETU/View/FenetreEtudiant.class :${SRC}/ETU/View/FenetreEtudiant.java \
${BUILD}/ETU/Controller/ObservateurFenetre.class \
${BUILD}/ETU/Controller/ObservateurChangeGroupe.class \
${BUILD}/Permanent/Controller/ObservateurFenetre.class \
${BUILD}/Permanent/Controller/ObservateurChangeGroupe.class \
${BUILD}/ETU/View/PanelEtudiant.class \
${BUILD}/ETU/Controller/ActionListenerChangeEtu.class
${BUILD}/Permanent/Controller/ActionListenerChangeEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/View/FenetreEtudiant.java
${BUILD}/ETU/View/PanelEtudiant.class : ${SRC}/ETU/View/PanelEtudiant.java
@@ -194,29 +184,20 @@ ${BUILD}/ETU/View/PanelEtudiant.class : ${SRC}/ETU/View/PanelEtudiant.java
## Controller ##
${BUILD}/ETU/Controller/ActionListenerChangeEtu.class : ${SRC}/ETU/Controller/ActionListenerChangeEtu.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Controller/ActionListenerChangeEtu.java
${BUILD}/ETU/Controller/ControllerGroupeBChangement.class : ${SRC}/ETU/Controller/ControllerGroupeBChangement.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Controller/ControllerGroupeBChangement.java
${BUILD}/ETU/Controller/ObservateurFenetre.class : ${SRC}/ETU/Controller/ObservateurFenetre.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Controller/ObservateurFenetre.java
${BUILD}/ETU/Controller/ObservateurChangeGroupe.class : ${SRC}/ETU/Controller/ObservateurChangeGroupe.java \
${BUILD}/ETU/Controller/ControllerGroupeBChangement.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Controller/ObservateurChangeGroupe.java
##....
##  Model ###
${BUILD}/ETU/Model/Model.class : ${SRC}/ETU/Model/Model.java \
${BUILD}/ETU/Model/ModelEtu.class : ${SRC}/ETU/Model/ModelEtu.java \
${BUILD}/API/Model.class \
${BUILD}/ETU/View/FenetreGroupe.class \
${BUILD}/ETU/View/FenetreEtudiant.class \
${BUILD}/Permanent/View/Chargement.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Model/Model.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Model/ModelEtu.java
## Permanent ##
@@ -230,8 +211,8 @@ ${BUILD}/ETU/Model/Model.class : ${SRC}/ETU/Model/Model.java \
${BUILD}/MNP/ChangementNP.class \
${BUILD}/MNP/AbstractGroupeFactoryNP.class \
${BUILD}/MNP/AbstractChangementFactoryNP.class \
${BUILD}/ROOT/Model/Model.class \
${BUILD}/ETU/Model/Model.class \
${BUILD}/ROOT/Model/ModelRoot.class \
${BUILD}/ETU/Model/ModelEtu.class \
${BUILD}/Permanent/View/Connexion.class \
${BUILD}/Permanent/Util/User.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Permanent/TestTexteMNP.java
@@ -248,6 +229,21 @@ ${BUILD}/Permanent/View/Connexion.class : ${SRC}/Permanent/View/Connexion.java
${BUILD}/Permanent/Util/User.class : ${SRC}/Permanent/Util/User.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Permanent/Util/User.java
## Controller ##
${BUILD}/Permanent/Controller/ObservateurFenetre.class : ${SRC}/Permanent/Controller/ObservateurFenetre.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Permanent/Controller/ObservateurFenetre.java
${BUILD}/Permanent/Controller/ObservateurChangeGroupe.class : ${SRC}/Permanent/Controller/ObservateurChangeGroupe.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Permanent/Controller/ObservateurChangeGroupe.java
${BUILD}/Permanent/Controller/ActionListenerChangeEtu.class : ${SRC}/Permanent/Controller/ActionListenerChangeEtu.java \
${BUILD}/Permanent/Controller/ControllerGroupeBChangement.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Permanent/Controller/ActionListenerChangeEtu.java
${BUILD}/Permanent/Controller/ControllerGroupeBChangement.class : ${SRC}/Permanent/Controller/ControllerGroupeBChangement.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Permanent/Controller/ControllerGroupeBChangement.java
# ## JARS ##
${JAR_MNP} : ${BUILD}/Permanent/TestTexteMNP.class