diff --git a/FI_PRJ.iml b/FI_PRJ.iml index 9bce85b..4f36145 100644 --- a/FI_PRJ.iml +++ b/FI_PRJ.iml @@ -1,6 +1,8 @@ - + + + diff --git a/FI_PRJ.jar b/FI_PRJ.jar new file mode 100644 index 0000000..261d00b Binary files /dev/null and b/FI_PRJ.jar differ diff --git a/Makefile b/Makefile index 705bc1b..67be308 100644 --- a/Makefile +++ b/Makefile @@ -1,35 +1,30 @@ -## Commandes -JAVA = javac -EXEC = java -OPTIONS = -cp "src/Test/libs/mariadb-connector.jar" -OPTIONS2 = -cp "src/Test/libs/mariadb-connector.jar;" -BUILD_EX = -d build/ -BUILD_DOCS = -d docs/ +# Commandes +JAVAC = javac +JAVA = java JAVADOC = javadoc -DEL = rm -rf -CREATEFILE = mkdir +OPTION_DOCS = -d docs/ +OPTION_COMPILE = -d build/ -cp "src/Test/libs/mariadb-connector.jar;" +OPTION_DOCS = -d docs/ -cp "src/Test/libs/mariadb-connector.jar;" +OPTION_EXE = -cp "build/Test/libs/mariadb-connector.jar;" +RM = rm -rf -## Chemin -BUILD = build/ -COMPILE = build/Test/TestTexteMNP -API = src/API/*.java -MNP = src/MNP/*.java -TEST = src/Test/*.java -DOCS = docs/ -MAIN = TestTexteMNP +# Chemin +API = src/API +MNP = src/MNP +TEST = src/Test +BUILD = build +ALL = *.java -.PHONY: run clean doc +# Arguments +.PHONY: run clean docs -## Compile run: - ${JAVA} ${BUILD_EX} ${OPTIONS} ${API} ${MNP} ${TEST} -Xlint:deprecation - cp -r src/Test/libs build/Test - cd build/Test - ${EXEC} ${OPTIONS2} ${MAIN} -Xlint:deprecation + $(JAVAC) $(OPTION_COMPILE) $(API)/$(ALL) $(MNP)/$(ALL) $(TEST)/$(ALL) + $(JAVA) $(OPTION_EXE) $(BUILD)/Test/TestTexteMNP + $(call docs) clean: - ${DEL} ${BUILD}* - ${DEL} ${DOCS}* + $(RM) build/* -doc: - ${JAVADOC} ${BUILD_DOCS} ${OPTIONS} ${API} ${MNP} ${TEST} \ No newline at end of file +docs: + $(JAVADOC) $(OPTION_DOCS) $(API)/$(ALL) $(MNP)/$(ALL) $(TEST)/$(ALL) \ No newline at end of file diff --git a/build/API/Etudiant.class b/build/API/Etudiant.class index b5eda6e..8313375 100644 Binary files a/build/API/Etudiant.class and b/build/API/Etudiant.class differ diff --git a/build/META-INF/MANIFEST.MF b/build/META-INF/MANIFEST.MF new file mode 100644 index 0000000..b694a72 --- /dev/null +++ b/build/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Test.TestTexteMNP + diff --git a/build/MNP/AbstractGroupeFactoryNP.class b/build/MNP/AbstractGroupeFactoryNP.class index b3d3523..5e35ada 100644 Binary files a/build/MNP/AbstractGroupeFactoryNP.class and b/build/MNP/AbstractGroupeFactoryNP.class differ diff --git a/build/MNP/EtudiantNP.class b/build/MNP/EtudiantNP.class index b8e40b7..124c014 100644 Binary files a/build/MNP/EtudiantNP.class and b/build/MNP/EtudiantNP.class differ diff --git a/build/MNP/GroupeNP.class b/build/MNP/GroupeNP.class index 48e3db2..c6c14b3 100644 Binary files a/build/MNP/GroupeNP.class and b/build/MNP/GroupeNP.class differ diff --git a/build/Test/BDatabase.class b/build/Test/BDatabase.class index 986677b..57e49e3 100644 Binary files a/build/Test/BDatabase.class and b/build/Test/BDatabase.class differ diff --git a/build/Test/BFrame.class b/build/Test/BFrame.class index e0ad284..8a4a3e1 100644 Binary files a/build/Test/BFrame.class and b/build/Test/BFrame.class differ diff --git a/build/Test/BLayout.class b/build/Test/BLayout.class new file mode 100644 index 0000000..01daf98 Binary files /dev/null and b/build/Test/BLayout.class differ diff --git a/build/Test/ProfView$1.class b/build/Test/ProfView$1.class new file mode 100644 index 0000000..3349152 Binary files /dev/null and b/build/Test/ProfView$1.class differ diff --git a/build/Test/ProfView$2.class b/build/Test/ProfView$2.class new file mode 100644 index 0000000..62f3124 Binary files /dev/null and b/build/Test/ProfView$2.class differ diff --git a/build/Test/ProfView$3.class b/build/Test/ProfView$3.class new file mode 100644 index 0000000..36e38a8 Binary files /dev/null and b/build/Test/ProfView$3.class differ diff --git a/build/Test/ProfView$4.class b/build/Test/ProfView$4.class new file mode 100644 index 0000000..1d00272 Binary files /dev/null and b/build/Test/ProfView$4.class differ diff --git a/build/Test/ProfView.class b/build/Test/ProfView.class new file mode 100644 index 0000000..314892e Binary files /dev/null and b/build/Test/ProfView.class differ diff --git a/build/Test/TestTexteMNP.class b/build/Test/TestTexteMNP.class index e858af1..b6f5e5e 100644 Binary files a/build/Test/TestTexteMNP.class and b/build/Test/TestTexteMNP.class differ diff --git a/docs/API/AbstractChangementFactory.html b/docs/API/AbstractChangementFactory.html index 7b9bb96..ac73a9d 100644 --- a/docs/API/AbstractChangementFactory.html +++ b/docs/API/AbstractChangementFactory.html @@ -2,9 +2,9 @@ - + AbstractChangementFactory - + diff --git a/docs/API/AbstractGroupeFactory.html b/docs/API/AbstractGroupeFactory.html index 2b09d16..e861f9d 100644 --- a/docs/API/AbstractGroupeFactory.html +++ b/docs/API/AbstractGroupeFactory.html @@ -2,9 +2,9 @@ - + AbstractGroupeFactory - + diff --git a/docs/API/Changement.html b/docs/API/Changement.html index 7ca17d6..3e25b3b 100644 --- a/docs/API/Changement.html +++ b/docs/API/Changement.html @@ -2,9 +2,9 @@ - + Changement - + diff --git a/docs/API/Etudiant.html b/docs/API/Etudiant.html index 6c7212d..7ec2d39 100644 --- a/docs/API/Etudiant.html +++ b/docs/API/Etudiant.html @@ -2,9 +2,9 @@ - + Etudiant - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":18}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":18}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -131,23 +131,29 @@ extends MonPrint int +getGroupe() +
Ajout de l'equipe pour recuperer son groupe
+ + + +int getId()
permet de récupérer l'identifiant de l'étudiant.
- + java.lang.String getNom()
permet de récupérer
- + java.lang.String getPrenom()
permet de récupérer
- + default java.lang.String monPrint()
Fonctionne comme ToPrint() sauf car une interface n'a pas le droit de faire un override sur ToPrint().
@@ -210,6 +216,20 @@ extends MonPrint + + + +
    +
  • +

    getGroupe

    +
    int getGroupe()
    +
    Ajout de l'equipe pour recuperer son groupe
    +
    +
    Returns:
    +
    Le groupe en entier
    +
    +
  • +
diff --git a/docs/API/Groupe.html b/docs/API/Groupe.html index 3f4fbbb..4f1585d 100644 --- a/docs/API/Groupe.html +++ b/docs/API/Groupe.html @@ -2,9 +2,9 @@ - + Groupe - + diff --git a/docs/API/MonPrint.html b/docs/API/MonPrint.html index 6dbc10a..5d151b4 100644 --- a/docs/API/MonPrint.html +++ b/docs/API/MonPrint.html @@ -2,9 +2,9 @@ - + MonPrint - + diff --git a/docs/API/TypeGroupe.html b/docs/API/TypeGroupe.html index beb1756..8a145ed 100644 --- a/docs/API/TypeGroupe.html +++ b/docs/API/TypeGroupe.html @@ -2,9 +2,9 @@ - + TypeGroupe - + diff --git a/docs/API/package-frame.html b/docs/API/package-frame.html index 95cab44..8089fec 100644 --- a/docs/API/package-frame.html +++ b/docs/API/package-frame.html @@ -2,9 +2,9 @@ - + API - + diff --git a/docs/API/package-summary.html b/docs/API/package-summary.html index 51f69cb..cb205b3 100644 --- a/docs/API/package-summary.html +++ b/docs/API/package-summary.html @@ -2,9 +2,9 @@ - + API - + @@ -43,7 +43,7 @@
diff --git a/docs/index.html b/docs/index.html index aadefb4..b877014 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) @@ -14,7 +14,6 @@

Packages

diff --git a/docs/overview-summary.html b/docs/overview-summary.html index df75dec..12f33ce 100644 --- a/docs/overview-summary.html +++ b/docs/overview-summary.html @@ -2,9 +2,9 @@ - + Overview - + @@ -81,14 +81,10 @@   -BPackage -  - - MNP   - + Test   diff --git a/docs/overview-tree.html b/docs/overview-tree.html index 0356ad3..f5b7281 100644 --- a/docs/overview-tree.html +++ b/docs/overview-tree.html @@ -2,9 +2,9 @@ - + Class Hierarchy - + @@ -73,7 +73,6 @@ Package Hierarchies: @@ -85,7 +84,7 @@ diff --git a/docs/package-list b/docs/package-list index 1b97c7b..7c04b26 100644 --- a/docs/package-list +++ b/docs/package-list @@ -1,4 +1,3 @@ API -BPackage MNP Test diff --git a/docs/serialized-form.html b/docs/serialized-form.html index 2477c11..f2677ae 100644 --- a/docs/serialized-form.html +++ b/docs/serialized-form.html @@ -2,9 +2,9 @@ - + Serialized Form - + @@ -116,6 +116,102 @@ +
  • + + +

    Class Test.BLayout extends java.awt.GridBagConstraints implements Serializable

    +
      +
    • +

      Serialized Fields

      +
        +
      • +

        PositionOnX

        +
        int PositionOnX
        +
      • +
      • +

        PositionOnY

        +
        int PositionOnY
        +
      • +
      • +

        takeCaseOnX

        +
        int takeCaseOnX
        +
      • +
      • +

        takeCaseOnY

        +
        int takeCaseOnY
        +
      • +
      • +

        sizeOnX

        +
        double sizeOnX
        +
      • +
      • +

        sizeOnY

        +
        double sizeOnY
        +
      • +
      • +

        padding_top

        +
        int padding_top
        +
      • +
      • +

        padding_left

        +
        int padding_left
        +
      • +
      • +

        padding_bottom

        +
        int padding_bottom
        +
      • +
      • +

        padding_right

        +
        int padding_right
        +
      • +
      • +

        padding

        +
        java.awt.Insets padding
        +
      • +
      • +

        positionOnScreen

        +
        int positionOnScreen
        +
      • +
      • +

        filler

        +
        int filler
        +
      • +
      +
    • +
    +
  • +
  • + + +

    Class Test.ProfView extends BFrame implements Serializable

    +
      +
    • +

      Serialized Fields

      +
        +
      • +

        e

        +
        java.util.ArrayList<E> e
        +
      • +
      • +

        g

        +
        java.util.ArrayList<E> g
        +
      • +
      • +

        groupeOption

        +
        javax.swing.JComboBox<E> groupeOption
        +
      • +
      • +

        text

        +
        javax.swing.JTextField text
        +
      • +
      • +

        db

        +
        BDatabase db
        +
      • +
      +
    • +
    +
  • diff --git a/out/production/FI_PRJ/API/AbstractChangementFactory.class b/out/production/FI_PRJ/API/AbstractChangementFactory.class deleted file mode 100644 index 3ce3579..0000000 Binary files a/out/production/FI_PRJ/API/AbstractChangementFactory.class and /dev/null differ diff --git a/out/production/FI_PRJ/API/AbstractGroupeFactory.class b/out/production/FI_PRJ/API/AbstractGroupeFactory.class deleted file mode 100644 index a04ccaa..0000000 Binary files a/out/production/FI_PRJ/API/AbstractGroupeFactory.class and /dev/null differ diff --git a/out/production/FI_PRJ/API/Changement.class b/out/production/FI_PRJ/API/Changement.class deleted file mode 100644 index 215e1ef..0000000 Binary files a/out/production/FI_PRJ/API/Changement.class and /dev/null differ diff --git a/out/production/FI_PRJ/API/Etudiant.class b/out/production/FI_PRJ/API/Etudiant.class deleted file mode 100644 index bd2ec0e..0000000 Binary files a/out/production/FI_PRJ/API/Etudiant.class and /dev/null differ diff --git a/out/production/FI_PRJ/API/Groupe.class b/out/production/FI_PRJ/API/Groupe.class deleted file mode 100644 index e01cae6..0000000 Binary files a/out/production/FI_PRJ/API/Groupe.class and /dev/null differ diff --git a/out/production/FI_PRJ/API/MonPrint.class b/out/production/FI_PRJ/API/MonPrint.class deleted file mode 100644 index 7f0751c..0000000 Binary files a/out/production/FI_PRJ/API/MonPrint.class and /dev/null differ diff --git a/out/production/FI_PRJ/API/TypeGroupe.class b/out/production/FI_PRJ/API/TypeGroupe.class deleted file mode 100644 index f836efa..0000000 Binary files a/out/production/FI_PRJ/API/TypeGroupe.class and /dev/null differ diff --git a/out/production/FI_PRJ/MNP/AbstractChangementFactoryNP.class b/out/production/FI_PRJ/MNP/AbstractChangementFactoryNP.class deleted file mode 100644 index 01ffb65..0000000 Binary files a/out/production/FI_PRJ/MNP/AbstractChangementFactoryNP.class and /dev/null differ diff --git a/out/production/FI_PRJ/MNP/AbstractGroupeFactoryNP.class b/out/production/FI_PRJ/MNP/AbstractGroupeFactoryNP.class deleted file mode 100644 index d044cc2..0000000 Binary files a/out/production/FI_PRJ/MNP/AbstractGroupeFactoryNP.class and /dev/null differ diff --git a/out/production/FI_PRJ/MNP/ChangementNP.class b/out/production/FI_PRJ/MNP/ChangementNP.class deleted file mode 100644 index da19d1e..0000000 Binary files a/out/production/FI_PRJ/MNP/ChangementNP.class and /dev/null differ diff --git a/out/production/FI_PRJ/MNP/EtudiantNP.class b/out/production/FI_PRJ/MNP/EtudiantNP.class deleted file mode 100644 index 4cf70da..0000000 Binary files a/out/production/FI_PRJ/MNP/EtudiantNP.class and /dev/null differ diff --git a/out/production/FI_PRJ/MNP/GroupeNP.class b/out/production/FI_PRJ/MNP/GroupeNP.class deleted file mode 100644 index e202b72..0000000 Binary files a/out/production/FI_PRJ/MNP/GroupeNP.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/BDatabase.class b/out/production/FI_PRJ/Test/BDatabase.class deleted file mode 100644 index 3fe9b7a..0000000 Binary files a/out/production/FI_PRJ/Test/BDatabase.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/BFrame.class b/out/production/FI_PRJ/Test/BFrame.class deleted file mode 100644 index 804af60..0000000 Binary files a/out/production/FI_PRJ/Test/BFrame.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/BLayout.class b/out/production/FI_PRJ/Test/BLayout.class deleted file mode 100644 index 67c8b30..0000000 Binary files a/out/production/FI_PRJ/Test/BLayout.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/ProfView$1.class b/out/production/FI_PRJ/Test/ProfView$1.class deleted file mode 100644 index ba2ad8a..0000000 Binary files a/out/production/FI_PRJ/Test/ProfView$1.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/ProfView$2.class b/out/production/FI_PRJ/Test/ProfView$2.class deleted file mode 100644 index ac2020c..0000000 Binary files a/out/production/FI_PRJ/Test/ProfView$2.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/ProfView$3.class b/out/production/FI_PRJ/Test/ProfView$3.class deleted file mode 100644 index 0b86732..0000000 Binary files a/out/production/FI_PRJ/Test/ProfView$3.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/ProfView$4.class b/out/production/FI_PRJ/Test/ProfView$4.class deleted file mode 100644 index 5ab601c..0000000 Binary files a/out/production/FI_PRJ/Test/ProfView$4.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/ProfView.class b/out/production/FI_PRJ/Test/ProfView.class deleted file mode 100644 index e1af3c7..0000000 Binary files a/out/production/FI_PRJ/Test/ProfView.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/TestTexteMNP.class b/out/production/FI_PRJ/Test/TestTexteMNP.class deleted file mode 100644 index aa3324c..0000000 Binary files a/out/production/FI_PRJ/Test/TestTexteMNP.class and /dev/null differ diff --git a/out/production/FI_PRJ/Test/libs/mariadb-connector.jar b/out/production/FI_PRJ/Test/libs/mariadb-connector.jar deleted file mode 100644 index 58d75f3..0000000 Binary files a/out/production/FI_PRJ/Test/libs/mariadb-connector.jar and /dev/null differ diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF new file mode 100644 index 0000000..b694a72 --- /dev/null +++ b/src/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Test.TestTexteMNP + diff --git a/src/Test/ProfView.java b/src/Test/ProfView.java index 3e0d1b5..202f9e2 100644 --- a/src/Test/ProfView.java +++ b/src/Test/ProfView.java @@ -46,7 +46,7 @@ public class ProfView extends BFrame implements ActionListener { public void Display() { BLayout settings = new BLayout(); settings.setPositionX(0); - settings.setPositionY(3); + settings.setPositionY(6); settings.setPositionY(0); JButton studList = new JButton("Voir la liste des etudiants");