repartition ROOT, ETU et utilisation de l'API respecter, correction de bug et ajout fonction visite de groupe d'un etudiant seulement ceux que il connait

This commit is contained in:
2022-11-26 18:09:08 +01:00
parent 203fca24cd
commit 47742b1ddc
35 changed files with 1670 additions and 686 deletions

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/Graphic/Controller/*.java src/fr/iutfbleau/projetIHM2022FI2/Graphic/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
clean :
rm -rf ${BUILD}/* *.jar
@@ -95,104 +95,162 @@ ${BUILD}/MNP/AbstractChangementFactoryNP.class : ${SRC}/MNP/AbstractChangementFa
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/MNP/AbstractChangementFactoryNP.java
## Graphic ##
## ROOT ##
## Util ###
${BUILD}/Graphic/Util/BD.class : ${SRC}/Graphic/Util/BD.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Util/BD.java
${BUILD}/ROOT/Util/BD.class : ${SRC}/ROOT/Util/BD.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Util/BD.java
${BUILD}/ROOT/Util/User.class : ${SRC}/ROOT/Util/User.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Util/User.java
## View ##
${BUILD}/Graphic/View/JTreeGroupe.class : ${SRC}/Graphic/View/JTreeGroupe.java \
${BUILD}/Graphic/Controller/TreeSelectionListenerGroupe.class \
${BUILD}/Graphic/Controller/TreeSelectionEventGroupe.class \
${BUILD}/Graphic/View/DefaultMutableTreeNodeGroupe.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/View/JTreeGroupe.java
${BUILD}/Graphic/View/FenetreGroupe.class : ${SRC}/Graphic/View/FenetreGroupe.java \
${BUILD}/Graphic/Controller/ObservateurFenetre.class \
${BUILD}/Graphic/Controller/ObservateurChangeGroupe.class \
${BUILD}/Graphic/Controller/ObservateurModifGroupe.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/View/FenetreGroupe.java
${BUILD}/ROOT/View/FenetreGroupe.class : ${SRC}/ROOT/View/FenetreGroupe.java \
${BUILD}/ROOT/Controller/ObservateurFenetre.class \
${BUILD}/ROOT/Controller/ObservateurChangeGroupe.class \
${BUILD}/ROOT/Controller/ObservateurModifGroupe.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/View/FenetreGroupe.java
${BUILD}/Graphic/View/FenetreEtudiant.class :${SRC}/Graphic/View/FenetreEtudiant.java \
${BUILD}/Graphic/Controller/ObservateurFenetre.class \
${BUILD}/Graphic/Controller/ObservateurChangeGroupe.class \
${BUILD}/Graphic/View/PanelEtudiant.class \
${BUILD}/Graphic/Controller/ActionListenerChangeEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/View/FenetreEtudiant.java
${BUILD}/ROOT/View/FenetreEtudiant.class :${SRC}/ROOT/View/FenetreEtudiant.java \
${BUILD}/ROOT/Controller/ObservateurFenetre.class \
${BUILD}/ROOT/Controller/ObservateurChangeGroupe.class \
${BUILD}/ROOT/View/PanelEtudiant.class \
${BUILD}/ROOT/Controller/ActionListenerChangeEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/View/FenetreEtudiant.java
${BUILD}/Graphic/View/PanelEtudiant.class : ${SRC}/Graphic/View/PanelEtudiant.java \
${BUILD}/Graphic/Controller/ActionListenerSuprEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/View/PanelEtudiant.java
${BUILD}/ROOT/View/PanelEtudiant.class : ${SRC}/ROOT/View/PanelEtudiant.java \
${BUILD}/ROOT/Controller/ActionListenerSuprEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/View/PanelEtudiant.java
${BUILD}/Graphic/View/Chargement.class : ${SRC}/Graphic/View/Chargement.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/View/Chargement.java
${BUILD}/ROOT/View/Chargement.class : ${SRC}/ROOT/View/Chargement.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/View/Chargement.java
${BUILD}/Graphic/View/FenetreSelectionEtu.class : ${SRC}/Graphic/View/FenetreSelectionEtu.java \
${BUILD}/Graphic/Controller/SelecteurEtudiant.class \
${BUILD}/Graphic/Controller/ActionListenerNouveauEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/View/FenetreSelectionEtu.java
${BUILD}/ROOT/View/FenetreSelectionEtu.class : ${SRC}/ROOT/View/FenetreSelectionEtu.java \
${BUILD}/ROOT/Controller/SelecteurEtudiant.class \
${BUILD}/ROOT/Controller/ActionListenerNouveauEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/View/FenetreSelectionEtu.java
${BUILD}/Graphic/View/DefaultMutableTreeNodeGroupe.class : ${SRC}/Graphic/View/DefaultMutableTreeNodeGroupe.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/View/DefaultMutableTreeNodeGroupe.java
## Controller ##
${BUILD}/Graphic/Controller/ActionListenerChangeEtu.class : ${SRC}/Graphic/Controller/ActionListenerChangeEtu.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/ActionListenerChangeEtu.java
${BUILD}/ROOT/Controller/ActionListenerChangeEtu.class : ${SRC}/ROOT/Controller/ActionListenerChangeEtu.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ActionListenerChangeEtu.java
${BUILD}/Graphic/Controller/ActionListenerSuprEtu.class : ${SRC}/Graphic/Controller/ActionListenerSuprEtu.java \
${BUILD}/ROOT/Controller/ActionListenerSuprEtu.class : ${SRC}/ROOT/Controller/ActionListenerSuprEtu.java \
${BUILD}/API/Etudiant.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/ActionListenerSuprEtu.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ActionListenerSuprEtu.java
${BUILD}/Graphic/Controller/ObservateurFenetre.class : ${SRC}/Graphic/Controller/ObservateurFenetre.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/ObservateurFenetre.java
${BUILD}/ROOT/Controller/ObservateurFenetre.class : ${SRC}/ROOT/Controller/ObservateurFenetre.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ObservateurFenetre.java
${BUILD}/Graphic/Controller/ObservateurModifGroupe.class : ${SRC}/Graphic/Controller/ObservateurModifGroupe.java \
${BUILD}/Graphic/View/FenetreSelectionEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/ObservateurModifGroupe.java
${BUILD}/ROOT/Controller/ObservateurModifGroupe.class : ${SRC}/ROOT/Controller/ObservateurModifGroupe.java \
${BUILD}/ROOT/View/FenetreSelectionEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ObservateurModifGroupe.java
${BUILD}/Graphic/Controller/ObservateurChangeGroupe.class : ${SRC}/Graphic/Controller/ObservateurChangeGroupe.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/ObservateurChangeGroupe.java
${BUILD}/ROOT/Controller/ObservateurChangeGroupe.class : ${SRC}/ROOT/Controller/ObservateurChangeGroupe.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ObservateurChangeGroupe.java
${BUILD}/Graphic/Controller/SelecteurEtudiant.class : ${SRC}/Graphic/Controller/SelecteurEtudiant.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/SelecteurEtudiant.java
${BUILD}/ROOT/Controller/SelecteurEtudiant.class : ${SRC}/ROOT/Controller/SelecteurEtudiant.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/SelecteurEtudiant.java
${BUILD}/Graphic/Controller/ActionListenerNouveauEtu.class : ${SRC}/Graphic/Controller/ActionListenerNouveauEtu.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/ActionListenerNouveauEtu.java
${BUILD}/ROOT/Controller/ActionListenerNouveauEtu.class : ${SRC}/ROOT/Controller/ActionListenerNouveauEtu.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Controller/ActionListenerNouveauEtu.java
${BUILD}/Graphic/Controller/TreeSelectionListenerGroupe.class : ${SRC}/Graphic/Controller/TreeSelectionListenerGroupe.java \
${BUILD}/Graphic/Controller/TreeSelectionEventGroupe.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/TreeSelectionListenerGroupe.java
${BUILD}/Graphic/Controller/TreeSelectionEventGroupe.class : ${SRC}/Graphic/Controller/TreeSelectionEventGroupe.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Controller/TreeSelectionEventGroupe.java
##....
##  Model ###
${BUILD}/Graphic/Model/Model.class : ${SRC}/Graphic/Model/Model.java \
${BUILD}/Graphic/View/FenetreGroupe.class \
${BUILD}/Graphic/View/FenetreEtudiant.class \
${BUILD}/Graphic/View/Chargement.class \
${BUILD}/Graphic/Util/BD.class \
${BUILD}/Graphic/Controller/TreeSelectionListenerGroupe.class \
${BUILD}/Graphic/View/JTreeGroupe.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Graphic/Model/Model.java
${BUILD}/ROOT/Model/Model.class : ${SRC}/ROOT/Model/Model.java \
${BUILD}/ROOT/View/FenetreGroupe.class \
${BUILD}/ROOT/View/FenetreEtudiant.class \
${BUILD}/ROOT/View/Chargement.class \
${BUILD}/ROOT/Util/BD.class \
${BUILD}/ROOT/Util/User.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ROOT/Model/Model.java
## ETU ##
## Util ###
${BUILD}/ETU/Util/BD.class : ${SRC}/ETU/Util/BD.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Util/BD.java
${BUILD}/ETU/Util/User.class : ${SRC}/ETU/Util/User.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Util/User.java
## View ##
${BUILD}/ETU/View/FenetreGroupe.class : ${SRC}/ETU/View/FenetreGroupe.java \
${BUILD}/ETU/Controller/ObservateurFenetre.class \
${BUILD}/ETU/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}/ETU/View/PanelEtudiant.class \
${BUILD}/ETU/Controller/ActionListenerChangeEtu.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/View/FenetreEtudiant.java
${BUILD}/ETU/View/PanelEtudiant.class : ${SRC}/ETU/View/PanelEtudiant.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/View/PanelEtudiant.java
${BUILD}/ETU/View/Chargement.class : ${SRC}/ETU/View/Chargement.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/View/Chargement.java
## Controller ##
${BUILD}/ETU/Controller/ActionListenerChangeEtu.class : ${SRC}/ETU/Controller/ActionListenerChangeEtu.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Controller/ActionListenerChangeEtu.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
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Controller/ObservateurChangeGroupe.java
##....
##  Model ###
${BUILD}/ETU/Model/Model.class : ${SRC}/ETU/Model/Model.java \
${BUILD}/ETU/View/FenetreGroupe.class \
${BUILD}/ETU/View/FenetreEtudiant.class \
${BUILD}/ETU/View/Chargement.class \
${BUILD}/ETU/Util/BD.class \
${BUILD}/ETU/Util/User.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/ETU/Model/Model.java
## TEST ##
${BUILD}/Test/Connexion.class : ${SRC}/Test/Connexion.java
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Test/Connexion.java
${BUILD}/Test/TestTexteMNP.class : ${SRC}/Test/TestTexteMNP.java \
${BUILD}/MNP/EtudiantNP.class \
${BUILD}/MNP/GroupeNP.class \
${BUILD}/MNP/ChangementNP.class \
${BUILD}/MNP/AbstractGroupeFactoryNP.class \
${BUILD}/MNP/AbstractChangementFactoryNP.class \
${BUILD}/Graphic/Model/Model.class
${JAVAC} -Xlint:deprecation ${JAVAC_OPTIONS} ${SRC}/Test/TestTexteMNP.java
${BUILD}/ROOT/Model/Model.class \
${BUILD}/ETU/Model/Model.class \
${BUILD}/Test/Connexion.class
${JAVAC} ${JAVAC_OPTIONS} ${SRC}/Test/TestTexteMNP.java
# ## JARS ##