Repository navigation
Permalink
Choose a base ref
{{ refName }}
default
Choose a head ref
{{ refName }}
default
Checking mergeability…
Don’t worry, you can still create the pull request.
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
base repository: ojcchar/OracleJava
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: tomdjarvinen/OracleJava
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
- 12 commits
- 7 files changed
- 1 contributor
Commits on Feb 23, 2016
-
Removed "REMOVE.txt" and updated "README.txt" with name and netID
Configuration menu - View commit details
-
Copy full SHA for 29fed3a - Browse repository at this point
Copy the full SHA 29fed3aView commit details -
I added a file books.txt containing a paragraph from Ralph Waldo Emerson's "Self Reliance," and appended the output of the git status command
Configuration menu - View commit details
-
Copy full SHA for 24cdd62 - Browse repository at this point
Copy the full SHA 24cdd62View commit details -
Added a text file containing answers to questions a-h from the assignment sheet.
Configuration menu - View commit details
-
Copy full SHA for 5611fbf - Browse repository at this point
Copy the full SHA 5611fbfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1cc78f0 - Browse repository at this point
Copy the full SHA 1cc78f0View commit details -
Add attribute woodTypes to HardwoodSeller class
Created a static List<woodItem> to hold the price and delivery values for all products sold.
Configuration menu - View commit details
-
Copy full SHA for 005b7d4 - Browse repository at this point
Copy the full SHA 005b7d4View commit details -
Creat WoodOrder defining elements of items in an order
Created class with attributes type, boardFeet, price, and delivery time to describe the information needed to process an order. Implemented getters for all attributes. Implemented setters for price and deliveryTime. Implemented constructors.
Configuration menu - View commit details
-
Copy full SHA for b5016e2 - Browse repository at this point
Copy the full SHA b5016e2View commit details -
Fixed small errors in HardwoodSeller and WoodItem
In HardwoodSeller, I initialized my list of woodTypes as an ArrayList. In WoodItem, two last cases of "daseDeliveryTime" were changed to "baseDeliveryTime".
Configuration menu - View commit details
-
Copy full SHA for 05577ea - Browse repository at this point
Copy the full SHA 05577eaView commit details -
WoodOrder defines the elements of information found in an order. Constructors, getters, and appropriate setters were defined for the class and its attributes: type, boardfeet, price, and deliveryTime.
Configuration menu - View commit details
-
Copy full SHA for 6c1cc1a - Browse repository at this point
Copy the full SHA 6c1cc1aView commit details -
Implement readInputFile method
readInputFile now successfully reads correctly formatted input files. The result is placed in variables for name, address, and date; and the remaining order information is stored in an ArrayList of WoodOrder objects.
Configuration menu - View commit details
-
Copy full SHA for ba8e7ca - Browse repository at this point
Copy the full SHA ba8e7caView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4cd6ae4 - Browse repository at this point
Copy the full SHA 4cd6ae4View commit details
Commits on Feb 25, 2016
-
Calculate delivery time of order
Added matchType() method, so WoodItem objects can be matched with the appropriate WoodOrder information such as price and cost. Added deliveryTime method which takes a ArrayList<WoodOrders> and returns an estimated delivery time.
Configuration menu - View commit details
-
Copy full SHA for b21bcb2 - Browse repository at this point
Copy the full SHA b21bcb2View commit details -
Completed Program. Price is now calculated. Filepath is taken as user input from console. Processed order is printed to console.
Configuration menu - View commit details
-
Copy full SHA for 82b75fa - Browse repository at this point
Copy the full SHA 82b75faView commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff master...master