Kind of Merge branch 'master' into usacocode

javaarchive · javaarchive · Jun 15, 2018 · Jun 24, 2018 · Jun 24, 2018 · Jun 24, 2018
commit 85a40a2e03b8ea39ac2d7b1ddf215ab476036bfa
diff --git a/.classpath b/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Java</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/README.md b/README.md
@@ -1,4 +1,11 @@
 # Java
+<<<<<<< HEAD
 DON'T use download
 USE RELEASES
 Some files belong to usaco and I do not own them. Also this is my code. Do not use without permission on usaco website!!!!!!!!!!
+=======
+Useful library for usaco and other purposes. 
+. Use releases when possible otherwise download usacotools.java. 
+# Release dates and more
+Find release dates at https://javaarchive.github.io/Java/. Moved to https://github.com/javaarchive/Java/wiki
+>>>>>>> master
diff --git a/compilestandard.class b/compilestandard.class
diff --git a/compilestandard.java b/compilestandard.java
@@ -1,57 +1,57 @@
-import java.io.*;
-import java.security.MessageDigest;
-import java.security.*;
-public class compilestandard extends usacotools {
-	public static String sha256(String input) throws NoSuchAlgorithmException {
-        MessageDigest mDigest = MessageDigest.getInstance("SHA-256");
-        byte[] result = mDigest.digest(input.getBytes());
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < result.length; i++) {
-            sb.append(Integer.toString((result[i] & 0xff) + 0x100, 16).substring(1));
-        }
-         
-        return sb.toString();
-    }
-	public static void main(String[] args) throws IOException{
-		// TODO Auto-generated method stub
-		BufferedReader f;
-		if(args.length==1) {
-			if(args[0].equals("eclipse")) {
-				f=mreader("src/usacotools.java");
-			}else {
-				f=mreader("usacotools.java");
-			}
-			
-		}else {
-				f=mreader("usacotools.java");
-			}
-		
-		print("build");
-		
-		String st;
-		String full="";
-		
-		while ((st = f.readLine()) != null) {
-		    full=full+st+"\n";
-		  }
-		String text=full.replace("if(!(lock)) {return null;}", "");
-		text=text.replace("public abstract class usacotools","public abstract class utools");
-	 	print(text);
-	 	PrintWriter pw=mwriter("utools.java");
-	 	if(args[0].equals("eclipse")) {
-			pw=mwriter("src/utools.java");
-		}else {
-			
-		}
-	 	pw.println(text);
-	 	pw.close();
-	 	print("utools.java is the one you should copy into your code but usacotools is the one you should extend");
-	 try{
-		 print("utools.java SHA256: "+sha256(text));
-	 	print("usacotools.java SHA256: "+sha256(full));
-	 }catch(Exception e) {
-		 e.printStackTrace();
-	 }
-	 	
-	}
-}
+import java.io.*;
+import java.security.MessageDigest;
+import java.security.*;
+public class compilestandard extends usacotools {
+	public static String sha256(String input) throws NoSuchAlgorithmException {
+        MessageDigest mDigest = MessageDigest.getInstance("SHA-256");
+        byte[] result = mDigest.digest(input.getBytes());
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < result.length; i++) {
+            sb.append(Integer.toString((result[i] & 0xff) + 0x100, 16).substring(1));
+        }
+
+        return sb.toString();
+    }
+	public static void main(String[] args) throws IOException{
+		// TODO Auto-generated method stub
+		BufferedReader f;
+		if(args.length==1) {
+			if(args[0].equals("eclipse")) {
+				f=mreader("src/usacotools.java");
+			}else {
+				f=mreader("usacotools.java");
+			}
+
+		}else {
+				f=mreader("usacotools.java");
+			}
+
+		print("build");
+
+		String st;
+		String full="";
+
+		while ((st = f.readLine()) != null) {
+		    full=full+st+"\n";
+		  }
+		String text=full.replace("if(!(lock)) {return null;}", "");
+		text=text.replace("public abstract class usacotools","public abstract class utools");
+	 	print(text);
+	 	PrintWriter pw=mwriter("utools.java");
+	 	if(args[0].equals("eclipse")) {
+			pw=mwriter("src/utools.java");
+		}else {
+
+		}
+	 	pw.println(text);
+	 	pw.close();
+	 	print("utools.java is the one you should copy into your code but usacotools is the one you should extend");
+	 try{
+		 print("utools.java SHA256: "+sha256(text));
+	 	print("usacotools.java SHA256: "+sha256(full));
+	 }catch(Exception e) {
+		 e.printStackTrace();
+	 }
+
+	}
+}
diff --git a/debuggableapp.class b/debuggableapp.class