Skip to content
Permalink

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
Choose a base ref
...
head repository: tomdjarvinen/OracleJava
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 7 files changed
  • 1 contributor

Commits on Feb 23, 2016

  1. Update text files

    Removed "REMOVE.txt" and updated "README.txt" with name and netID
    tomdjarvinen committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    29fed3a View commit details
    Browse the repository at this point in the history
  2. Add file books.txt

    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
    tomdjarvinen committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    24cdd62 View commit details
    Browse the repository at this point in the history
  3. Add answers.txt

    Added a text file containing answers to questions a-h from the
    assignment sheet.
    tomdjarvinen committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    5611fbf View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1cc78f0 View commit details
    Browse the repository at this point in the history
  5. Add attribute woodTypes to HardwoodSeller class

    Created a static List<woodItem> to hold the price and delivery
    values for all products sold.
    tomdjarvinen committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    005b7d4 View commit details
    Browse the repository at this point in the history
  6. 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.
    tomdjarvinen committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    b5016e2 View commit details
    Browse the repository at this point in the history
  7. 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".
    tomdjarvinen committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    05577ea View commit details
    Browse the repository at this point in the history
  8. Add WoodOrder class

    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.
    tomdjarvinen committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    6c1cc1a View commit details
    Browse the repository at this point in the history
  9. 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.
    tomdjarvinen committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    ba8e7ca View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    4cd6ae4 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2016

  1. 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.
    tomdjarvinen committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    b21bcb2 View commit details
    Browse the repository at this point in the history
  2. Complete Program

    Completed Program.  Price is now calculated.  Filepath is taken
    as user input from console.  Processed order is printed to console.
    tomdjarvinen committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    82b75fa View commit details
    Browse the repository at this point in the history
Loading