Updated branches and cleaned up things from last year.

.gitignore

@@ -1,110 +1,14 @@
+### Java ###
 *.class
 
 # Package Files #
 *.jar
 *.war
 *.ear
 
-# Netbeans Files #
-build/*
-nbproject/*
-build.properties
-build.xml
-
-# Doc files #
-doc/*
-
-*.pydevproject
-.project
-.metadata
-bin/**
-tmp/**
-tmp/**/*
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-.*
-!.gitignore
-*~
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-*.tmproj
-*.tmproject
-tmtags
-
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
-
-nbproject/private/
+### NetBeans ###
+nbproject/
 build/
-nbbuild/
 dist/
-nbdist/
-nbactions.xml
-nb-configuration.xml
-
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# It's better to unpack these files and commit the raw source because
-# git has its own built in compression methods.
-*.7z
-*.jar
-*.rar
-*.zip
-*.gz
-*.bzip
-*.bz2
-*.xz
-*.lzma
-
-#packing-only formats
-*.iso
-*.tar
-
-#package management formats
-*.dmg
-*.xpi
-*.gem
-*.egg
-*.deb
-*.rpm
+build.properties
+build.xml

README.md

@@ -1,23 +1,4 @@
-###Team 4334 - Alberta Tech Alliance###
-###Main Code Repository###
-###Git Version Control System###
-
-##Java Code##
+# Team 4334 - Alberta Tech Alliance
+## Robot Code (Java)
 
 This is our team's code repository, used to store our robot code. Branches can be used for testing features. Be sure to understand git fully before making changes.
-
-##Rules##
-
-When working in this repository, be sure to commit to the correct branch. Branches are set up so that sub-teams can work on their own piece of the program, without being bothered by merging and fast-forward updates.
-
-##How we organize the repository##
-
-Branches have been revamped to three main branches. Descriptions are available below.
-
-###Branches###
-There are 3 branches. These branches are organized in a way that different sub-teams can work on code individually pretty well.
-It is worth noting that all branches use underscore letters, and they are capitalized just to look nicer.
-
-* **Depreciated**: Used to store history of master. Is usually one of two commits behind master. does not serve any purpose other than letting master get messed up and being able to rebase master to its preferred configuration.
-* **Master**: Our basic master branch. Every time we achieve functional robot code in the _testing_ branch, it will be pushed up to master.
-* **Testing**: Used to make features that are not verified to have worked yet. This will be the most commonly used branch to use when testing.

src/edu/first/util/Arrays.java

@@ -1,6 +1,6 @@
 package edu.first.util;
 
-import com.sun.squawk.util.Comparer;
+import edu.first.lang.Comparator;
 import edu.first.util.list.Collections;
 import edu.first.util.list.List;
 
@@ -194,7 +194,7 @@ public static void sort(float[] a, int fromIndex, int toIndex) {
      * @param a the array to be sorted
      * @param c the comparator to determine the order of the array
      */
-    public static void sort(Object[] a, Comparer c) {
+    public static void sort(Object[] a, Comparator c) {
         com.sun.squawk.util.Arrays.sort(a, c);
     }
 
@@ -206,7 +206,7 @@ public static void sort(Object[] a, Comparer c) {
      * @param toIndex the index of the last element, exclusive, to be sorted
      * @param c the comparator to determine the order of the array
      */
-    public static void sort(Object[] a, int fromIndex, int toIndex, Comparer c) {
+    public static void sort(Object[] a, int fromIndex, int toIndex, Comparator c) {
         com.sun.squawk.util.Arrays.sort(a, fromIndex, toIndex, c);
     }
 
@@ -375,7 +375,7 @@ public static int binarySearch(float[] a, float key) {
      * specified key. Note that this guarantees that the return value will be 0
      * if and only if the key is found
      */
-    public static int binarySearch(Object[] a, Object key, Comparer c) {
+    public static int binarySearch(Object[] a, Object key, Comparator c) {
         return com.sun.squawk.util.Arrays.binarySearch(a, key, c);
     }
 

src/edu/first/util/list/Collections.java

@@ -5,7 +5,7 @@
 package edu.first.util.list;
 
 import com.sun.squawk.util.Arrays;
-import com.sun.squawk.util.Comparer;
+import edu.first.lang.Comparator;
 import java.util.NoSuchElementException;
 
 /**
@@ -24,8 +24,8 @@ private Collections() throws IllegalStateException {
 
     /**
      * Sorts the specified list into ascending order, according to the
-     * {@linkplain Comparer natural ordering} of its elements. All elements in
-     * the list must implement the {@link Comparer} interface. Furthermore,
+     * {@linkplain Comparator natural ordering} of its elements. All elements in
+     * the list must implement the {@link Comparator} interface. Furthermore,
      * all elements in the list must be
      * <i>mutually comparable</i> (that is, {@code e1.compareTo(e2)} must not
      * throw a {@code ClassCastException} for any elements {@code e1} and
@@ -73,9 +73,9 @@ private Collections() throws IllegalStateException {
      * not support the {@code set} operation.
      * @throws IllegalArgumentException (optional) if the implementation detects
      * that the natural ordering of the list elements is found to violate the
-     * {@link Comparer} contract
+     * {@link Comparator} contract
      */
-    public static void sort(List list, Comparer c) {
+    public static void sort(List list, Comparator c) {
         Object[] a = list.toArray();
         Arrays.sort(a, c);
         list.clear();