avancées javadoc6

java/.idea/workspace.xml

@@ -7,6 +7,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Modele/package-info.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionErreurs/BDDException.class" afterPath="$PROJECT_DIR$/out/production/java/GestionErreurs/BDDException.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfaceGraphique/Bouton.class" afterPath="$PROJECT_DIR$/out/production/java/InterfaceGraphique/Bouton.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionBddDAO/ConfigBDD.class" afterPath="$PROJECT_DIR$/out/production/java/GestionBddDAO/ConfigBDD.class" />
@@ -18,10 +19,8 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.class" afterPath="$PROJECT_DIR$/out/production/java/InterfaceGraphique/DialogBoxes/NouvelleQuestionDialog.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.class" afterPath="$PROJECT_DIR$/out/production/java/InterfaceGraphique/DialogBoxes/NouvelleReponseDialog.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfaceGraphique/SplashScreen.class" afterPath="$PROJECT_DIR$/out/production/java/InterfaceGraphique/SplashScreen.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/Bouton.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Modele/Categorie.java" afterPath="$PROJECT_DIR$/src/Modele/Categorie.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Modele/Question.java" afterPath="$PROJECT_DIR$/src/Modele/Question.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java" afterPath="$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Modele/Reponses.java" afterPath="$PROJECT_DIR$/src/Modele/Reponses.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="java.iws" />
@@ -54,38 +53,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Question.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/Modele/Question.java">
+      <file leaf-file-name="package-info.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Modele/package-info.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.09514926">
-              <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
-              <folding>
-                <element signature="e#439#440#0" expanded="true" />
-                <element signature="e#461#462#0" expanded="true" />
-                <element signature="e#506#507#0" expanded="true" />
-                <element signature="e#537#538#0" expanded="true" />
-                <element signature="e#569#570#0" expanded="true" />
-                <element signature="e#591#592#0" expanded="true" />
-                <element signature="e#636#637#0" expanded="true" />
-                <element signature="e#667#668#0" expanded="true" />
-                <element signature="e#699#700#0" expanded="true" />
-                <element signature="e#721#722#0" expanded="true" />
-                <element signature="e#766#767#0" expanded="true" />
-                <element signature="e#797#798#0" expanded="true" />
-                <element signature="e#825#826#0" expanded="true" />
-                <element signature="e#846#847#0" expanded="true" />
-                <element signature="e#886#887#0" expanded="true" />
-                <element signature="e#915#916#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Reponses.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+            <state vertical-scroll-proportion="0.063432835">
+              <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
               <folding />
             </state>
           </provider>
@@ -147,6 +119,8 @@
         <option value="$PROJECT_DIR$/src/InterfaceGraphique/SplashScreen.java" />
         <option value="$PROJECT_DIR$/src/Modele/Categorie.java" />
         <option value="$PROJECT_DIR$/src/Modele/Question.java" />
+        <option value="$PROJECT_DIR$/src/Modele/Reponses.java" />
+        <option value="$PROJECT_DIR$/src/Modele/package-info.java" />
       </list>
     </option>
   </component>
@@ -774,7 +748,13 @@
       <option name="project" value="LOCAL" />
       <updated>1433973812842</updated>
     </task>
-    <option name="localTasksCounter" value="32" />
+    <task id="LOCAL-00032" summary="avancées javadoc5">
+      <created>1433975034387</created>
+      <option name="number" value="00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1433975034387</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <servers />
   </component>
   <component name="TodoView">
@@ -827,7 +807,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="creation classe de base" />
     <MESSAGE value="evolution" />
     <MESSAGE value="evolution (pikachu evolue en raichu)" />
     <MESSAGE value="+mieux l'interface et easter egg ajouté" />
@@ -852,7 +831,8 @@
     <MESSAGE value="avancées javadoc2" />
     <MESSAGE value="avancées javadoc3" />
     <MESSAGE value="avancées javadoc4" />
-    <option name="LAST_COMMIT_MESSAGE" value="avancées javadoc4" />
+    <MESSAGE value="avancées javadoc5" />
+    <option name="LAST_COMMIT_MESSAGE" value="avancées javadoc5" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1186,9 +1166,53 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.74626863">
+          <caret line="60" column="95" selection-start-line="60" selection-start-column="95" selection-end-line="60" selection-end-column="95" />
+          <folding>
+            <element signature="e#555#556#0" expanded="true" />
+            <element signature="e#577#578#0" expanded="true" />
+            <element signature="e#688#689#0" expanded="true" />
+            <element signature="e#719#720#0" expanded="true" />
+            <element signature="e#819#820#0" expanded="true" />
+            <element signature="e#841#842#0" expanded="true" />
+            <element signature="e#954#955#0" expanded="true" />
+            <element signature="e#985#986#0" expanded="true" />
+            <element signature="e#1164#1165#0" expanded="true" />
+            <element signature="e#1223#1224#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Modele/Question.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.048507463">
+          <caret line="100" column="31" selection-start-line="100" selection-start-column="31" selection-end-line="100" selection-end-column="31" />
+          <folding>
+            <element signature="e#873#874#0" expanded="true" />
+            <element signature="e#895#896#0" expanded="true" />
+            <element signature="e#1028#1029#0" expanded="true" />
+            <element signature="e#1059#1060#0" expanded="true" />
+            <element signature="e#1157#1158#0" expanded="true" />
+            <element signature="e#1179#1180#0" expanded="true" />
+            <element signature="e#1290#1291#0" expanded="true" />
+            <element signature="e#1321#1322#0" expanded="true" />
+            <element signature="e#1421#1422#0" expanded="true" />
+            <element signature="e#1443#1444#0" expanded="true" />
+            <element signature="e#1556#1557#0" expanded="true" />
+            <element signature="e#1587#1588#0" expanded="true" />
+            <element signature="e#1711#1712#0" expanded="true" />
+            <element signature="e#1732#1733#0" expanded="true" />
+            <element signature="e#1868#1869#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/Modele/Categorie.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8731343">
+        <state vertical-scroll-proportion="0.74626863">
           <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
           <folding />
         </state>
@@ -1202,39 +1226,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Modele/Reponses.java">
+    <entry file="file://$PROJECT_DIR$/src/Modele/package-info.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.063432835">
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Modele/Question.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.09514926">
-          <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
-          <folding>
-            <element signature="e#439#440#0" expanded="true" />
-            <element signature="e#461#462#0" expanded="true" />
-            <element signature="e#506#507#0" expanded="true" />
-            <element signature="e#537#538#0" expanded="true" />
-            <element signature="e#569#570#0" expanded="true" />
-            <element signature="e#591#592#0" expanded="true" />
-            <element signature="e#636#637#0" expanded="true" />
-            <element signature="e#667#668#0" expanded="true" />
-            <element signature="e#699#700#0" expanded="true" />
-            <element signature="e#721#722#0" expanded="true" />
-            <element signature="e#766#767#0" expanded="true" />
-            <element signature="e#797#798#0" expanded="true" />
-            <element signature="e#825#826#0" expanded="true" />
-            <element signature="e#846#847#0" expanded="true" />
-            <element signature="e#886#887#0" expanded="true" />
-            <element signature="e#915#916#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>

java/src/Modele/Question.java

@@ -6,11 +6,30 @@ package Modele;
  */
 public class Question
 {
+	/**
+	 * Intitulé de la qustion.
+	 */
 	protected String intitule;
+	/**
+	 * Réponse une.
+	 */
 	protected String reponse1;
+	/**
+	 * Réponse deux.
+	 */
 	protected String reponse2;
+	/**
+	 * Numéro bonne réponses.
+	 */
 	protected int reponse;
 
+	/**
+	 * Constructeur initiant les champs de la question.
+	 * @param intitule Intitulé de la question.
+	 * @param reponse1 Réponse une.
+	 * @param reponse2 Réponse deux.
+	 * @param reponse Numéro bonne réponse.
+	 */
 	public Question(String intitule, String reponse1, String reponse2, int reponse) {
 		this.intitule = intitule;
 		this.reponse1 = reponse1;
@@ -18,38 +37,74 @@ public class Question
 		this.reponse = reponse;
 	}
 
+	/**
+	 * Renvoie l'intitulé de la question.
+	 * @return l'intitulé de la question.
+	 */
 	public String getIntitule() {
 		return intitule;
 	}
 
+	/**
+	 * Modifie l'intitulé de la question.
+	 * @return l'intitulé de la question.
+	 */
 	public void setIntitule(String intitule) {
 		this.intitule = intitule;
 	}
 
+	/**
+	 * Renvoie la réponse une.
+	 * @return la réponse une.
+	 */
 	public String getReponse1() {
 		return reponse1;
 	}
 
+	/**
+	 * Modifie la réponse une.
+	 * @return la réponse une.
+	 */
 	public void setReponse1(String reponse1) {
 		this.reponse1 = reponse1;
 	}
 
+	/**
+	 * Renvoie la réponse deux.
+	 * @return la réponse deux.
+	 */
 	public String getReponse2() {
 		return reponse2;
 	}
 
+	/**
+	 * Modifie la réponse deux.
+	 * @return la réponse deux.
+	 */
 	public void setReponse2(String reponse2) {
 		this.reponse2 = reponse2;
 	}
 
+	/**
+	 * Renvoie le numéro de la bonne réponse.
+	 * @return le numéro de la bonne réponse.
+	 */
 	public int getReponse() {
 		return reponse;
 	}
 
+	/**
+	 * Modifie le numéro de la bonne réponse.
+	 * @return le numéro de la bonne réponse.
+	 */
 	public void setReponse(int reponse) {
 		this.reponse = reponse;
 	}
 
+	/**
+	 * Renvoie une chaine représentant l'objet, sous la forme: "intitulé | bonneRéponse".
+	 * @return une chaine représentant l'objet.
+	 */
 	public String toString() {
 		String bonneReponse = new String();
 		if(reponse == 0)

java/src/Modele/Reponses.java

@@ -1,31 +1,66 @@
 package Modele;
 
+/**
+ * Modéle représentant un jeu de réponses.
+ * @author joseph
+ */
 public class Reponses
 {
+	/**
+	 * Réponse 1
+	 */
 	protected String reponse1;
+	/**
+	 * Réponse 2
+	 */
 	protected String reponse2;
 
+	/**
+	 * Constructeur d'initialisation des réponses du jeu.
+	 * @param reponse1 Réponse une.
+	 * @param reponse2 Réponse deux.
+	 */
 	public Reponses(String reponse1, String reponse2) {
 		this.reponse1 = reponse1;
 		this.reponse2 = reponse2;
 	}
 
+	/**
+	 * Renvoie la réponse une.
+	 * @return la réponse une.
+	 */
 	public String getReponse1() {
 		return reponse1;
 	}
 
+	/**
+	 * Modifie la réponse une.
+	 * @return la réponse une.
+	 */
 	public void setReponse1(String reponse1) {
 		this.reponse1 = reponse1;
 	}
 
+	/**
+	 * Renvoie la réponse deux.
+	 * @return la réponse deux.
+	 */
 	public String getReponse2() {
 		return reponse2;
 	}
 
+	/**
+	 * Modifie la réponse deux.
+	 * @return la réponse deux.
+	 */
 	public void setReponse2(String reponse2) {
 		this.reponse2 = reponse2;
 	}
 
+	/**
+	 * Renvoie une chaine représentant l'objet, sous la forme: "reponse1, reponse2 ou les deux?".
+	 * @return une chaine représentant l'objet.
+	 */
 	public String toString() {
 		return  reponse1 + ", " + reponse2 + " ou les deux?";
 	}

java/src/Modele/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Contient les modéles représentant les données manipulées.
+ * @author joseph
+ */
+package Modele;