Ref: Gradle sur tout le projet

.classpath

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/main" path="src/main/java">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="src/main/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="src/test/java">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="src/test/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

.gitignore

@@ -1,3 +1,5 @@
-/bin/
-.*
-*.class
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build

.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bot-irc-with-graddle</name>
+	<comment>Project bot-irc-with-graddle created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

README.md

@@ -1 +0,0 @@
-# bot-irc

UML.ucls

@@ -1,507 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<class-diagram version="1.2.2" icons="true" always-add-relationships="false" generalizations="true" realizations="true" 
-  associations="true" dependencies="false" nesting-relationships="true" router="FAN">  
-  <class id="1" language="java" name="data.ISP" project="bot-irc" file="/bot-irc/src/data/ISP.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="548" y="353"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="2" language="java" name="data.ISPDAO" project="bot-irc" file="/bot-irc/src/data/ISPDAO.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1565" y="638"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="3" language="java" name="data.ISPdata" project="bot-irc" file="/bot-irc/src/data/ISPdata.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="837" y="1403"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <enumeration id="4" language="java" name="data.TechnoCoverage" project="bot-irc" 
-    file="/bot-irc/src/data/TechnoCoverage.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="495" y="1190"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </enumeration>  
-  <class id="5" language="java" name="IRC.Server" project="bot-irc" file="/bot-irc/src/IRC/Server.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="837" y="879"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <enumeration id="6" language="java" name="IRC.Server.Type" project="bot-irc" file="/bot-irc/src/IRC/Server.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1082" y="903"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </enumeration>  
-  <interface id="7" language="java" name="main.AffichableSurIRC" project="bot-irc" 
-    file="/bot-irc/src/main/AffichableSurIRC.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="831" y="614"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </interface>  
-  <class id="8" language="java" name="main.Bot" project="bot-irc" file="/bot-irc/src/main/Bot.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1939" y="251"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="9" language="java" name="main.Cache" project="bot-irc" file="/bot-irc/src/main/Cache.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1091" y="521"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="10" language="java" name="main.CacheReloader" project="bot-irc" file="/bot-irc/src/main/CacheReloader.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="830" y="236"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="11" language="java" name="main.Main" project="bot-irc" file="/bot-irc/src/main/Main.java" binary="false" 
-    corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1074" y="41"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="12" language="java" name="data.CoveredAreas" project="bot-irc" file="/bot-irc/src/data/CoveredAreas.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="505" y="891"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="13" language="java" name="actions.Action" project="bot-irc" file="/bot-irc/src/actions/Action.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="2294" y="32"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="14" language="java" name="main.RejoinThread" project="bot-irc" file="/bot-irc/src/main/RejoinThread.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1560" y="285"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="15" language="java" name="data.AddresseToGPS" project="bot-irc" file="/bot-irc/src/data/AddresseToGPS.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1570" y="1061"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="16" language="java" name="data.AddresseToGPS.Lieu" project="bot-irc" 
-    file="/bot-irc/src/data/AddresseToGPS.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1566" y="1404"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="17" language="java" name="data.Coordinates" project="bot-irc" file="/bot-irc/src/data/Coordinates.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1277" y="1404"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="18" language="java" name="data.MultiplePossibleAddressException" project="bot-irc" 
-    file="/bot-irc/src/data/MultiplePossibleAddressException.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1569" y="1570"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="19" language="java" name="rss.RSSChecker" project="bot-irc" file="/bot-irc/src/rss/RSSChecker.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="2272" y="429"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="20" language="java" name="rss.RssData" project="bot-irc" file="/bot-irc/src/rss/RssData.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1862" y="1012"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="21" language="java" name="rss.RssDataRemainder" project="bot-irc" 
-    file="/bot-irc/src/rss/RssDataRemainder.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="2084" y="818"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="22" language="java" name="comportement.Comportement" project="bot-irc" 
-    file="/bot-irc/src/comportement/Comportement.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="185" width="258" x="1515" y="-159"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <association id="23">    
-    <end type="SOURCE" refId="16" navigable="false">      
-      <attribute id="24" name="coordonees">        
-        <position height="0" width="0" x="0" y="0"/>      
-      </attribute>      
-      <multiplicity id="25" minimum="0" maximum="1">        
-        <position height="0" width="0" x="0" y="0"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="17" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="26">    
-    <end type="SOURCE" refId="19" navigable="false">      
-      <attribute id="27" name="b"/>      
-      <multiplicity id="28" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="8" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="29">    
-    <end type="SOURCE" refId="18" navigable="false">      
-      <attribute id="30" name="lieux">        
-        <position height="0" width="0" x="0" y="0"/>      
-      </attribute>      
-      <multiplicity id="31" minimum="0" maximum="2147483647">        
-        <position height="0" width="0" x="0" y="0"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="16" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <dependency id="32">    
-    <end type="SOURCE" refId="1"/>    
-    <end type="TARGET" refId="9"/>  
-  </dependency>  
-  <association id="33">    
-    <end type="SOURCE" refId="3" navigable="false">      
-      <attribute id="34" name="coordonnees">        
-        <position height="0" width="0" x="0" y="0"/>      
-      </attribute>      
-      <multiplicity id="35" minimum="0" maximum="1">        
-        <position height="0" width="0" x="0" y="0"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="17" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <dependency id="36">    
-    <end type="SOURCE" refId="14"/>    
-    <end type="TARGET" refId="11"/>  
-  </dependency>  
-  <dependency id="37">    
-    <bendpoint x="1711" y="121"/>    
-    <end type="SOURCE" refId="11"/>    
-    <end type="TARGET" refId="8"/>  
-  </dependency>  
-  <dependency id="38">    
-    <end type="SOURCE" refId="8"/>    
-    <end type="TARGET" refId="14"/>  
-  </dependency>  
-  <nesting id="39">    
-    <end type="SOURCE" refId="15"/>    
-    <end type="TARGET" refId="16"/>  
-  </nesting>  
-  <association id="40">    
-    <end type="SOURCE" refId="1" navigable="false">      
-      <attribute id="41" name="data">        
-        <position height="0" width="0" x="-35" y="-301"/>      
-      </attribute>      
-      <multiplicity id="42" minimum="0" maximum="1">        
-        <position height="0" width="0" x="-35" y="-301"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="3" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <realization id="43">    
-    <bendpoint x="1566" y="815"/>    
-    <bendpoint x="942" y="789"/>    
-    <bendpoint x="940" y="674"/>    
-    <end type="SOURCE" refId="21"/>    
-    <end type="TARGET" refId="7"/>  
-  </realization>  
-  <association id="44">    
-    <end type="SOURCE" refId="19" navigable="false">      
-      <attribute id="45" name="remainder"/>      
-      <multiplicity id="46" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="21" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <dependency id="47">    
-    <bendpoint x="2276" y="1014"/>    
-    <end type="SOURCE" refId="19"/>    
-    <end type="TARGET" refId="20"/>  
-  </dependency>  
-  <dependency id="48">    
-    <end type="SOURCE" refId="11"/>    
-    <end type="TARGET" refId="10"/>  
-  </dependency>  
-  <realization id="49">    
-    <end type="SOURCE" refId="9"/>    
-    <end type="TARGET" refId="7"/>  
-  </realization>  
-  <association id="50">    
-    <end type="SOURCE" refId="12" navigable="false">      
-      <attribute id="51" name="technos">        
-        <position height="0" width="0" x="292" y="1151"/>      
-      </attribute>      
-      <multiplicity id="52" minimum="0" maximum="2147483647">        
-        <position height="0" width="0" x="292" y="1151"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="4" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <dependency id="53">    
-    <end type="SOURCE" refId="10"/>    
-    <end type="TARGET" refId="9"/>  
-  </dependency>  
-  <realization id="54">    
-    <bendpoint x="1675" y="842"/>    
-    <bendpoint x="939" y="800"/>    
-    <bendpoint x="929" y="678"/>    
-    <end type="SOURCE" refId="20"/>    
-    <end type="TARGET" refId="7"/>  
-  </realization>  
-  <dependency id="55">    
-    <end type="SOURCE" refId="15"/>    
-    <end type="TARGET" refId="2"/>  
-  </dependency>  
-  <dependency id="56">    
-    <end type="SOURCE" refId="9"/>    
-    <end type="TARGET" refId="2"/>  
-  </dependency>  
-  <association id="57">    
-    <end type="SOURCE" refId="8" navigable="false">      
-      <attribute id="58" name="actions">        
-        <position height="0" width="0" x="291" y="-47"/>      
-      </attribute>      
-      <multiplicity id="59" minimum="0" maximum="2147483647">        
-        <position height="0" width="0" x="291" y="-47"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="13" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="60">    
-    <end type="SOURCE" refId="3" navigable="false">      
-      <attribute id="61" name="ircChan">        
-        <position height="0" width="0" x="-10" y="-165"/>      
-      </attribute>      
-      <multiplicity id="62" minimum="0" maximum="2147483647">        
-        <position height="0" width="0" x="-10" y="-165"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="5" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="63">    
-    <end type="SOURCE" refId="8" navigable="false">      
-      <attribute id="64" name="rssdata"/>      
-      <multiplicity id="65" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="21" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="66">    
-    <end type="SOURCE" refId="22" navigable="false">      
-      <attribute id="67" name="bot"/>      
-      <multiplicity id="68" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="8" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="69">    
-    <end type="SOURCE" refId="8" navigable="false">      
-      <attribute id="70" name="comportements"/>      
-      <multiplicity id="71" minimum="0" maximum="2147483647"/>    
-    </end>    
-    <end type="TARGET" refId="22" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <dependency id="72">    
-    <end type="SOURCE" refId="9"/>    
-    <end type="TARGET" refId="11"/>  
-  </dependency>  
-  <association id="73">    
-    <end type="SOURCE" refId="9" navigable="false">      
-      <attribute id="74" name="cache">        
-        <position height="0" width="0" x="91" y="-461"/>      
-      </attribute>      
-      <multiplicity id="75" minimum="0" maximum="2147483647">        
-        <position height="0" width="0" x="91" y="-461"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="1" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="76">    
-    <end type="SOURCE" refId="21" navigable="false">      
-      <attribute id="77" name="data"/>      
-      <multiplicity id="78" minimum="0" maximum="2147483647"/>    
-    </end>    
-    <end type="TARGET" refId="20" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <dependency id="79">    
-    <bendpoint x="1556" y="459"/>    
-    <bendpoint x="1274" y="452"/>    
-    <bendpoint x="1273" y="267"/>    
-    <end type="SOURCE" refId="2"/>    
-    <end type="TARGET" refId="11"/>  
-  </dependency>  
-  <realization id="80">    
-    <end type="SOURCE" refId="5"/>    
-    <end type="TARGET" refId="7"/>  
-  </realization>  
-  <association id="81">    
-    <end type="SOURCE" refId="2" navigable="false">      
-      <attribute id="82" name="instance">        
-        <position height="0" width="0" x="12" y="32"/>      
-      </attribute>      
-      <multiplicity id="83" minimum="0" maximum="1">        
-        <position height="0" width="0" x="12" y="32"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="2" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <nesting id="84">    
-    <end type="SOURCE" refId="5"/>    
-    <end type="TARGET" refId="6"/>  
-  </nesting>  
-  <dependency id="85">    
-    <end type="SOURCE" refId="2"/>    
-    <end type="TARGET" refId="3"/>  
-  </dependency>  
-  <association id="86">    
-    <end type="SOURCE" refId="5" navigable="false">      
-      <attribute id="87" name="t">        
-        <position height="0" width="0" x="65" y="-98"/>      
-      </attribute>      
-      <multiplicity id="88" minimum="0" maximum="1">        
-        <position height="0" width="0" x="65" y="-98"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="6" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <realization id="89">    
-    <end type="SOURCE" refId="1"/>    
-    <end type="TARGET" refId="7"/>  
-  </realization>  
-  <association id="90">    
-    <end type="SOURCE" refId="9" navigable="false">      
-      <attribute id="91" name="instance">        
-        <position height="0" width="0" x="36" y="10"/>      
-      </attribute>      
-      <multiplicity id="92" minimum="0" maximum="1">        
-        <position height="0" width="0" x="36" y="10"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="9" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="93">    
-    <end type="SOURCE" refId="13" navigable="false">      
-      <attribute id="94" name="bot"/>      
-      <multiplicity id="95" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="8" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="96">    
-    <end type="SOURCE" refId="1" navigable="false">      
-      <attribute id="97" name="coveredAreas">        
-        <position height="0" width="0" x="356" y="543"/>      
-      </attribute>      
-      <multiplicity id="98" minimum="0" maximum="2147483647">        
-        <position height="0" width="0" x="356" y="543"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="12" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <association id="99">    
-    <end type="SOURCE" refId="12" navigable="false">      
-      <attribute id="100" name="isp">        
-        <position height="0" width="0" x="91" y="-461"/>      
-      </attribute>      
-      <multiplicity id="101" minimum="0" maximum="1">        
-        <position height="0" width="0" x="91" y="-461"/>      
-      </multiplicity>    
-    </end>    
-    <end type="TARGET" refId="1" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-    sort-features="false" accessors="true" visibility="true">    
-    <attributes public="true" package="true" protected="true" private="true" static="true"/>    
-    <operations public="true" package="true" protected="true" private="true" static="true"/>  
-  </classifier-display>  
-  <association-display labels="true" multiplicity="true"/>
-</class-diagram>

bin/.gitignore

@@ -0,0 +1,2 @@
+/main/
+/test/

build.gradle

@@ -0,0 +1,42 @@
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: 'application'
+
+
+sourceCompatibility = 1.8
+version = '1.0'
+
+jar {
+	manifest {
+		attributes 'Implementation-Title': 'UneFede',
+				   'Implementation-Version': version
+	}
+}
+
+repositories {
+	jcenter()
+    maven { url 'https://jitpack.io' }
+    mavenCentral()
+    flatDir	{
+    	dirs '/lib/'
+   	}
+}
+
+dependencies {
+	implementation 'com.github.sys1yagi.mastodon4j:build:1.7.0'
+	compile group: 'commons-io', name: 'commons-io', version: '2.6'
+	compile group: 'org.json', name: 'json', version: '20180813'
+	compile group: 'pircbot', name: 'pircbot', version: '1.5.0'
+	compile group: 'org.twitter4j', name: 'twitter4j-core', version: '4.0.7'
+	compile group: 'org.twitter4j', name: 'twitter4j-async', version: '4.0.7'
+	compile group: 'org.twitter4j', name: 'twitter4j-stream', version: '4.0.7'
+	compile group: 'com.github.sys1yagi.mastodon4j', name: 'mastodon4j', version: '1.7.0'
+}
+
+application {
+	mainClassName="bot.irc.main.Main"
+}
+
+run {
+
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

ressources/rp/index.txt

@@ -1,2 +0,0 @@
-
-

settings.gradle

@@ -0,0 +1,10 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * 
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/5.0-rc-5/userguide/multi_project_builds.html
+ */
+
+rootProject.name = 'bot-irc-with-graddle'

src/IRC/Server.java

@@ -1,9 +1,9 @@
-package IRC;
+package bot.irc.IRC;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import main.AffichableSurIRC;
+import bot.irc.main.AffichableSurIRC;
 
 /**
  * Cette classe à pour but de stocker les serveurs/channels pour les FAI

src/actions/Action.java

@@ -1,11 +1,10 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import data.Message;
-import main.Bot;
-import main.IRCBot;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
 
 public abstract class Action {
 

src/actions/Contact.java

@@ -1,13 +1,12 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import data.ISP;
-import data.Message;
-import main.Bot;
-import main.Cache;
-import verif_saisie.EntierPositifNonVide;
+import bot.irc.data.ISP;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
+import bot.irc.main.Cache;
 
 public class Contact extends Action {
 
@@ -62,7 +61,6 @@ public class Contact extends Action {
 		return res;
 	}
 
-	
 
 }
 

src/actions/Distance.java

@@ -1,17 +1,17 @@
-package actions;
+package bot.irc.action;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import data.AddresseToGPS;
-import data.AddresseToGPS.Lieu;
-import data.Coordinates;
-import data.ISP;
-import data.Message;
-import data.ErrorAddressException;
-import main.Bot;
-import main.Cache;
+import bot.irc.data.AddresseToGPS;
+import bot.irc.data.AddresseToGPS.Lieu;
+import bot.irc.data.Coordinates;
+import bot.irc.data.ErrorAddressException;
+import bot.irc.data.ISP;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
+import bot.irc.main.Cache;
 
 public class Distance extends Action {
 	public static final int NOMBRE_AFFICHABLE = 3;

src/actions/Help.java

@@ -1,10 +1,10 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import data.Message;
-import main.Bot;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
 
 public class Help extends Action {
 

src/actions/ID.java

@@ -1,14 +1,13 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import data.ISP;
-import data.Message;
-import main.IRCBot;
-import main.Bot;
-import main.Cache;
-import verif_saisie.EntierPositifNonVide;
+import bot.irc.data.ISP;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
+import bot.irc.main.Cache;
+import bot.irc.verif_saisie.EntierPositifNonVide;
 
 /**
  * Classe d'action servant à la récuperation de l'ID d'un FAI utilisé pour le stocker dans DB.FFDN

src/actions/Info.java

@@ -1,16 +1,15 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import data.CoveredAreas;
-import data.ISP;
-import data.ISPDAO;
-import data.Message;
-import main.IRCBot;
-import main.Bot;
-import main.Cache;
-import verif_saisie.EntierPositifNonVide;
+import bot.irc.data.CoveredAreas;
+import bot.irc.data.ISP;
+import bot.irc.data.ISPDAO;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
+import bot.irc.main.Cache;
+import bot.irc.verif_saisie.EntierPositifNonVide;
 /**
  * Classe d'Action servant à gérer une demande d'info sur un FAI
  * @author marmat

src/actions/Liste.java

@@ -1,15 +1,15 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import data.ISP;
-import data.ISPDAO;
-import data.Message;
-import main.AffichableSurIRC;
-import main.Bot;
-import main.Cache;
+import bot.irc.data.ISP;
+import bot.irc.data.ISPDAO;
+import bot.irc.data.Message;
+import bot.irc.main.AffichableSurIRC;
+import bot.irc.main.Bot;
+import bot.irc.main.Cache;
 
 /**
  * Classe servant à la récuperation d'une liste des FAI présents dans la base de donnée.

src/actions/RP.java

@@ -1,4 +1,4 @@
-package actions;
+package bot.irc.action;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -9,10 +9,10 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import data.Message;
-import main.Bot;
-import main.Main;
-import main.PropertiesSetter;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
+import bot.irc.main.Main;
+import bot.irc.main.PropertiesSetter;
 
 /**
  * Méthode pour gérer la sauvegarde de liens dans un fichier pour en faire une revue de presse.

src/actions/RSS.java

@@ -1,13 +1,13 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import data.Message;
-import main.Bot;
-import main.Main;
-import rss.RssData;
-import rss.RssDataRemainder;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
+import bot.irc.main.Main;
+import bot.irc.rss.RssData;
+import bot.irc.rss.RssDataRemainder;
 
 /**
  * gère les actions liées au RSS
@@ -44,7 +44,7 @@ public class RSS extends Action {
 				int id = message.getElementAsInt(i);
 				RssData data = remainder.getDataWithId(id);
 				if(data != null) {
-					bot.sendMessages(sender, channel, data);
+					bot.sendMessages(sender, channel, data.toStringIRC());
 				}else {
 					bot.sendMessage(sender, channel, "erreur: le nombre "+id+" n'est pas correct, ce dernier doit être entre 0 et "+(remainder.getCompletion()-1));
 				}

src/actions/Reload.java

@@ -1,13 +1,13 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import data.Message;
-import main.Bot;
-import main.Cache;
-import main.Main;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
+import bot.irc.main.Cache;
+import bot.irc.main.Main;
 
 /**
  * Classe servant à l'action de forcer une mise à jour des informations

src/actions/Source.java

@@ -1,10 +1,10 @@
-package actions;
+package bot.irc.action;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import data.Message;
-import main.Bot;
+import bot.irc.data.Message;
+import bot.irc.main.Bot;
 
 /**
  * Indique simplement où on peut trouver le code source

src/comportement/Cafe.java

@@ -1,11 +1,11 @@
-package comportement;
+package bot.irc.comportement;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import main.IRCBot;
-import main.Main;
+import bot.irc.main.IRCBot;
+import bot.irc.main.Main;
 
 /**
  * Singleton de comportement pour pouvoir demander au bot un thé ou un café

src/comportement/Comportement.java

@@ -1,9 +1,9 @@
-package comportement;
+package bot.irc.comportement;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import main.IRCBot;
+import bot.irc.main.IRCBot;
 
 public abstract class Comportement {
 

src/comportement/Philo.java

@@ -1,4 +1,4 @@
-package comportement;
+package bot.irc.comportement;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,9 +10,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import actions.Action;
-import main.IRCBot;
-import main.Main;
+import bot.irc.action.Action;
+import bot.irc.main.IRCBot;
+import bot.irc.main.Main;
 
 /**
  * Singleton de comportement permettant au bot de faire de la philosophie

src/data/AddresseToGPS.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

src/data/Coordinates.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 public class Coordinates {
 	

src/data/CoveredAreas.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 import java.util.ArrayList;
 import java.util.List;

src/data/ErrorAddressException.java

@@ -1,6 +1,6 @@
-package data;
+package bot.irc.data;
 
-import data.AddresseToGPS.Lieu;
+import bot.irc.data.AddresseToGPS.Lieu;
 
 /**
  * Classe servant pour {@link AddresseToGPS} a indiquer plusieurs possibilitées et a les stoquer, afin qu'elles soient traitées dans un catch ou a indiquer qu'aucune n'est disponible

src/data/ISP.java

@@ -1,13 +1,13 @@
-package data;
+package bot.irc.data;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import IRC.Server;
-import main.AffichableSurIRC;
-import main.Cache;
-import main.Main;
+import bot.irc.IRC.Server;
+import bot.irc.main.AffichableSurIRC;
+import bot.irc.main.Cache;
+import bot.irc.main.Main;
 
 public class ISP implements AffichableSurIRC {
 

src/data/ISPDAO.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -21,7 +21,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import main.Main;
+import bot.irc.main.Main;
 
 public class ISPDAO {
 

src/data/ISPdata.java

@@ -1,11 +1,11 @@
-package data;
+package bot.irc.data;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import IRC.Server;
-import main.Main;
+import bot.irc.IRC.Server;
+import bot.irc.main.Main;
 
 public class ISPdata {
 

src/data/Message.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 import java.util.ArrayList;
 import java.util.List;

src/data/PointInPoligonTest.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 public class PointInPoligonTest {
 

src/data/Polygon.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/data/Segment.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 /**
  * Cette classe représente un segment composé de 2 coordonées.(points)

src/data/TechnoCoverage.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 /**
  * Cette enum permet de de transformer toutes les techno annoncée dans les zones couvertes en une valeur.

src/data/TestAdresseToGPS.java

@@ -1,6 +1,6 @@
-package data;
+package bot.irc.data;
 
-import data.AddresseToGPS.Lieu;
+import bot.irc.data.AddresseToGPS.Lieu;
 
 public class TestAdresseToGPS {
 

src/data/TestCoordinates.java

@@ -1,4 +1,4 @@
-package data;
+package bot.irc.data;
 
 import java.util.Scanner;
 

src/data/TestDAO.java

@@ -1,17 +1,17 @@
-package data;
-
-public class TestDAO {
-
-	public TestDAO() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public static void main(String[] args) throws Exception {
-		ISPDAO dao = ISPDAO.getInstance();
-		ISP i = dao.getISP(1);
-		System.out.println(i);
-		
-
-	}
-
-}
+package bot.irc.data;
+
+public class TestDAO {
+
+	public TestDAO() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public static void main(String[] args) throws Exception {
+		ISPDAO dao = ISPDAO.getInstance();
+		ISP i = dao.getISP(1);
+		System.out.println(i);
+		
+
+	}
+
+}

src/main/AffichableSurIRC.java

@@ -1,4 +1,4 @@
-package main;
+package bot.irc.main;
 
 import java.util.List;
 

src/main/Bot.java

@@ -1,4 +1,4 @@
-package main;
+package bot.irc.main;
 
 import java.util.List;
 

src/main/Cache.java

@@ -1,4 +1,4 @@
-package main;
+package bot.irc.main;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
@@ -6,9 +6,9 @@ import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
-import data.CoveredAreas;
-import data.ISP;
-import data.ISPDAO;
+import bot.irc.data.CoveredAreas;
+import bot.irc.data.ISP;
+import bot.irc.data.ISPDAO;
 
 public class Cache implements AffichableSurIRC {
 	/**

src/main/CacheReloader.java

@@ -1,83 +1,83 @@
-package main;
-
-import java.util.Date;
-
-public class CacheReloader implements Runnable {
-	/**
-	 * Le but de cette classe est de permettre la mise à jour régulière du cache.
-	 * Pour cela, cette classe implémente est de type runnable, c'est à dire qu'elle possède une méthode pour creer un Thread qui vient ensuite se charger de la Mise à Jour.
-	 * Une fois une instance créée, elle se lance par start()
-	 * 
-	 */
-		private Thread thread;
-		private String threadName;
-		private long timeout;
-		boolean end = false;
-		
-	/**
-	 * Contructeur de la classe
-	 * @param timeout Temps à attendre entre chaque mise à jour
-	 */
-
-	public CacheReloader(long timeout) {
-		this.threadName="Cache reloader";
-		this.timeout=timeout;
-	}
-
-	/**
-	 * Met à jour le cache. Méthode appelée lors de la création du thread sur une instance de cette classe.
-	 */
-	@Override
-	public void run() {
-		try {
-			do {
-			Cache c = Cache.getInstance();
-			long lastCacheUpdate = c.getLastCacheUpdate().getTime();
-			long now = new Date().getTime();
-			if(lastCacheUpdate+timeout < now) {
-				if(Main.isDebug()) {
-					Date d = new Date();
-					System.out.println(d+" : "+"Mise à jour du cache à partir de DB");
-				}
-				c.reload();
-			}
-			Thread.sleep(timeout*1000);
-			}while(!end);
-			
-		}catch(InterruptedException ie) {
-			System.err.println("Le thread de mise à jour du cache a été interompu");
-			
-		}
-
-	}
-	
-	/**
-	 * Methode pour lancer le cache reloader
-	 */
-	
-	public void start() {
-		System.out.println("Démarage du cache Reloader. Mise à jour toute les "+timeout+" secondes.");
-		if(thread == null) {
-			thread = new Thread(this, this.threadName);
-			thread.start();
-		}
-		
-	}
-
-	/**
-	 * @return the timeout
-	 */
-	public final long getTimeout() {
-		return timeout;
-	}
-
-	/**
-	 * @param timeout the timeout to set
-	 */
-	public final void setTimeout(long timeout) {
-		this.timeout = timeout;
-	}
-	
-	
-
-}
+package bot.irc.main;
+
+import java.util.Date;
+
+public class CacheReloader implements Runnable {
+	/**
+	 * Le but de cette classe est de permettre la mise à jour régulière du cache.
+	 * Pour cela, cette classe implémente est de type runnable, c'est à dire qu'elle possède une méthode pour creer un Thread qui vient ensuite se charger de la Mise à Jour.
+	 * Une fois une instance créée, elle se lance par start()
+	 * 
+	 */
+		private Thread thread;
+		private String threadName;
+		private long timeout;
+		boolean end = false;
+		
+	/**
+	 * Contructeur de la classe
+	 * @param timeout Temps à attendre entre chaque mise à jour
+	 */
+
+	public CacheReloader(long timeout) {
+		this.threadName="Cache reloader";
+		this.timeout=timeout;
+	}
+
+	/**
+	 * Met à jour le cache. Méthode appelée lors de la création du thread sur une instance de cette classe.
+	 */
+	@Override
+	public void run() {
+		try {
+			do {
+			Cache c = Cache.getInstance();
+			long lastCacheUpdate = c.getLastCacheUpdate().getTime();
+			long now = new Date().getTime();
+			if(lastCacheUpdate+timeout < now) {
+				if(Main.isDebug()) {
+					Date d = new Date();
+					System.out.println(d+" : "+"Mise à jour du cache à partir de DB");
+				}
+				c.reload();
+			}
+			Thread.sleep(timeout*1000);
+			}while(!end);
+			
+		}catch(InterruptedException ie) {
+			System.err.println("Le thread de mise à jour du cache a été interompu");
+			
+		}
+
+	}
+	
+	/**
+	 * Methode pour lancer le cache reloader
+	 */
+	
+	public void start() {
+		System.out.println("Démarage du cache Reloader. Mise à jour toute les "+timeout+" secondes.");
+		if(thread == null) {
+			thread = new Thread(this, this.threadName);
+			thread.start();
+		}
+		
+	}
+
+	/**
+	 * @return the timeout
+	 */
+	public final long getTimeout() {
+		return timeout;
+	}
+
+	/**
+	 * @param timeout the timeout to set
+	 */
+	public final void setTimeout(long timeout) {
+		this.timeout = timeout;
+	}
+	
+	
+
+}

src/main/IRCBot.java

@@ -1,4 +1,4 @@
-package main;
+package bot.irc.main;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
@@ -9,10 +9,9 @@ import org.jibble.pircbot.IrcException;
 import org.jibble.pircbot.NickAlreadyInUseException;
 import org.jibble.pircbot.PircBot;
 
-import actions.Action;
-import comportement.Comportement;
-import data.Message;
-import rss.RssDataRemainder;
+import bot.irc.action.Action;
+import bot.irc.comportement.Comportement;
+import bot.irc.data.Message;
 
 public class IRCBot extends PircBot implements Bot {
 

src/main/Main.java

@@ -1,4 +1,4 @@
-package main;
+package bot.irc.main;
 
 import java.net.ConnectException;
 import java.text.SimpleDateFormat;
@@ -6,9 +6,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import rss.RSSChecker;
-import rss.RssDataRemainder;
-import socials.TwitterBot;
+import bot.irc.rss.RSSChecker;
+import bot.irc.rss.RssDataRemainder;
+import bot.irc.socials.TwitterBot;
+
 
 public class Main {