Correction des warning de Eclipse
La classe javafx.util.Pair n'aurait pas dû être utilisé dans le projet (Utilisation réservée en interne à l'API JavaFX). Utilisation de org.javatuples:javatuples comme librairie pour la classe Pair.
This commit is contained in:
		
							
								
								
									
										6
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								pom.xml
									
									
									
									
									
								
							| @@ -34,5 +34,11 @@ | |||||||
|             <scope>system</scope> |             <scope>system</scope> | ||||||
|             <systemPath>${project.basedir}/../libs/BungeePerms-3.0-alpha1-modif.jar</systemPath> |             <systemPath>${project.basedir}/../libs/BungeePerms-3.0-alpha1-modif.jar</systemPath> | ||||||
|         </dependency> |         </dependency> | ||||||
|  |         <dependency> | ||||||
|  |             <groupId>org.javatuples</groupId> | ||||||
|  |             <artifactId>javatuples</artifactId> | ||||||
|  |             <version>1.2</version> | ||||||
|  |             <scope>compile</scope> | ||||||
|  |         </dependency> | ||||||
|     </dependencies> |     </dependencies> | ||||||
| </project> | </project> | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ import fr.pandacube.java.util.db.SQLStaticPages; | |||||||
| import fr.pandacube.java.util.db.SQLUUIDPlayer; | import fr.pandacube.java.util.db.SQLUUIDPlayer; | ||||||
| import fr.pandacube.java.util.db.sql_tools.SQLWhereChain.SQLBoolOp; | import fr.pandacube.java.util.db.sql_tools.SQLWhereChain.SQLBoolOp; | ||||||
| import fr.pandacube.java.util.db.sql_tools.SQLWhereComp.SQLComparator; | import fr.pandacube.java.util.db.sql_tools.SQLWhereComp.SQLComparator; | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * <b>ORM = Object-Relational Mapping</b> |  * <b>ORM = Object-Relational Mapping</b> | ||||||
| @@ -108,11 +108,11 @@ public final class ORM { | |||||||
| 		boolean first = true; | 		boolean first = true; | ||||||
| 		for (SQLField<E, ?> f : tableFields) { | 		for (SQLField<E, ?> f : tableFields) { | ||||||
| 			Pair<String, List<Object>> statementPart = f.forSQLPreparedStatement(); | 			Pair<String, List<Object>> statementPart = f.forSQLPreparedStatement(); | ||||||
| 			params.addAll(statementPart.getValue()); | 			params.addAll(statementPart.getValue1()); | ||||||
|  |  | ||||||
| 			if (!first) sql += ", "; | 			if (!first) sql += ", "; | ||||||
| 			first = false; | 			first = false; | ||||||
| 			sql += statementPart.getKey(); | 			sql += statementPart.getValue0(); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		sql += ", PRIMARY KEY id(id))"; | 		sql += ", PRIMARY KEY id(id))"; | ||||||
| @@ -185,8 +185,8 @@ public final class ORM { | |||||||
|  |  | ||||||
| 			if (where != null) { | 			if (where != null) { | ||||||
| 				Pair<String, List<Object>> ret = where.toSQL(); | 				Pair<String, List<Object>> ret = where.toSQL(); | ||||||
| 				sql += " WHERE " + ret.getKey(); | 				sql += " WHERE " + ret.getValue0(); | ||||||
| 				params.addAll(ret.getValue()); | 				params.addAll(ret.getValue1()); | ||||||
| 			} | 			} | ||||||
| 			if (orderBy != null) sql += " ORDER BY " + orderBy.toSQL(); | 			if (orderBy != null) sql += " ORDER BY " + orderBy.toSQL(); | ||||||
| 			if (limit != null) sql += " LIMIT " + limit; | 			if (limit != null) sql += " LIMIT " + limit; | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ package fr.pandacube.java.util.db.sql_tools; | |||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  |  | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| public class SQLField<E extends SQLElement<E>, T> { | public class SQLField<E extends SQLElement<E>, T> { | ||||||
|  |  | ||||||
| @@ -58,7 +58,7 @@ public class SQLField<E extends SQLElement<E>, T> { | |||||||
| 	 */ | 	 */ | ||||||
| 	@Override | 	@Override | ||||||
| 	public String toString() { | 	public String toString() { | ||||||
| 		return forSQLPreparedStatement().getKey().replaceFirst("\\?", | 		return forSQLPreparedStatement().getValue0().replaceFirst("\\?", | ||||||
| 				(defaultValue != null && !autoIncrement) ? defaultValue.toString() : ""); | 				(defaultValue != null && !autoIncrement) ? defaultValue.toString() : ""); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ package fr.pandacube.java.util.db.sql_tools; | |||||||
|  |  | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  |  | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| public abstract class SQLWhere { | public abstract class SQLWhere { | ||||||
|  |  | ||||||
| @@ -10,7 +10,7 @@ public abstract class SQLWhere { | |||||||
|  |  | ||||||
| 	@Override | 	@Override | ||||||
| 	public String toString() { | 	public String toString() { | ||||||
| 		return toSQL().getKey(); | 		return toSQL().getValue0(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ package fr.pandacube.java.util.db.sql_tools; | |||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  |  | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| public class SQLWhereChain extends SQLWhere { | public class SQLWhereChain extends SQLWhere { | ||||||
|  |  | ||||||
| @@ -32,8 +32,8 @@ public class SQLWhereChain extends SQLWhere { | |||||||
| 			first = false; | 			first = false; | ||||||
|  |  | ||||||
| 			Pair<String, List<Object>> ret = w.toSQL(); | 			Pair<String, List<Object>> ret = w.toSQL(); | ||||||
| 			sql += "(" + ret.getKey() + ")"; | 			sql += "(" + ret.getValue0() + ")"; | ||||||
| 			params.addAll(ret.getValue()); | 			params.addAll(ret.getValue1()); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		return new Pair<>(sql, params); | 		return new Pair<>(sql, params); | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ package fr.pandacube.java.util.db.sql_tools; | |||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  |  | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| public class SQLWhereComp extends SQLWhere { | public class SQLWhereComp extends SQLWhere { | ||||||
|  |  | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ package fr.pandacube.java.util.db.sql_tools; | |||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  |  | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| public class SQLWhereLike extends SQLWhere { | public class SQLWhereLike extends SQLWhere { | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ import java.util.List; | |||||||
| import java.util.logging.Level; | import java.util.logging.Level; | ||||||
|  |  | ||||||
| import fr.pandacube.java.util.Log; | import fr.pandacube.java.util.Log; | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| public class SQLWhereNull extends SQLWhere { | public class SQLWhereNull extends SQLWhere { | ||||||
|  |  | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ import fr.pandacube.java.util.network.packet.PacketException; | |||||||
| import fr.pandacube.java.util.network.packet.PacketServer; | import fr.pandacube.java.util.network.packet.PacketServer; | ||||||
| import fr.pandacube.java.util.network.packet.ResponseCallback; | import fr.pandacube.java.util.network.packet.ResponseCallback; | ||||||
| import fr.pandacube.java.util.network.packet.packets.global.PacketServerException; | import fr.pandacube.java.util.network.packet.packets.global.PacketServerException; | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| public class TCPClient extends Thread implements Closeable { | public class TCPClient extends Thread implements Closeable { | ||||||
|  |  | ||||||
| @@ -123,9 +123,9 @@ public class TCPClient extends Thread implements Closeable { | |||||||
| 			for(Iterator<Pair<Predicate<PacketServer>, ResponseCallback<PacketServer>>> it = callbacks.iterator(); it.hasNext();) { | 			for(Iterator<Pair<Predicate<PacketServer>, ResponseCallback<PacketServer>>> it = callbacks.iterator(); it.hasNext();) { | ||||||
| 				Pair<Predicate<PacketServer>, ResponseCallback<PacketServer>> c = it.next(); | 				Pair<Predicate<PacketServer>, ResponseCallback<PacketServer>> c = it.next(); | ||||||
| 				try { | 				try { | ||||||
| 					if (c.getKey().test(ps)) { | 					if (c.getValue0().test(ps)) { | ||||||
| 						it.remove(); | 						it.remove(); | ||||||
| 						c.getValue().call(ps); | 						c.getValue1().call(ps); | ||||||
| 						executedOne = true; | 						executedOne = true; | ||||||
| 					} | 					} | ||||||
| 				} catch (Exception e) { | 				} catch (Exception e) { | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ import fr.pandacube.java.util.network.packet.PacketServer; | |||||||
| import fr.pandacube.java.util.network.packet.ResponseCallback; | import fr.pandacube.java.util.network.packet.ResponseCallback; | ||||||
| import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer; | import fr.pandacube.java.util.network.packet.bytebuffer.ByteBuffer; | ||||||
| import fr.pandacube.java.util.network.packet.packets.global.PacketServerException; | import fr.pandacube.java.util.network.packet.packets.global.PacketServerException; | ||||||
| import javafx.util.Pair; | import org.javatuples.Pair; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * |  * | ||||||
| @@ -179,9 +179,9 @@ public class TCPServer extends Thread implements Closeable { | |||||||
| 				for(Iterator<Pair<Predicate<PacketClient>, ResponseCallback<PacketClient>>> it = callbacks.iterator(); it.hasNext();) { | 				for(Iterator<Pair<Predicate<PacketClient>, ResponseCallback<PacketClient>>> it = callbacks.iterator(); it.hasNext();) { | ||||||
| 					Pair<Predicate<PacketClient>, ResponseCallback<PacketClient>> c = it.next(); | 					Pair<Predicate<PacketClient>, ResponseCallback<PacketClient>> c = it.next(); | ||||||
| 					try { | 					try { | ||||||
| 						if (c.getKey().test(pc)) { | 						if (c.getValue0().test(pc)) { | ||||||
| 							it.remove(); | 							it.remove(); | ||||||
| 							c.getValue().call(pc); | 							c.getValue1().call(pc); | ||||||
| 							executedOne = true; | 							executedOne = true; | ||||||
| 						} | 						} | ||||||
| 					} catch (Exception e) { | 					} catch (Exception e) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user