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: jciacco15/OracleJava
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: th13/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
  • 17 files changed
  • 1 contributor

Commits on Jan 27, 2016

  1. Update information files

    Add repo owner information to README.txt and remove REMOVE.txt
    th13 committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    312f194 View commit details
    Browse the repository at this point in the history
  2. Update book.txt

    Added book.txt to the git repository and appended the result of `git status`
    (run after the initial adding of the file to git) to the file.
    th13 committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    718f168 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    71a1736 View commit details
    Browse the repository at this point in the history
  4. Update .gitignore file to ignore IntelliJ project files

    IntelliJ adds several configuration files and an output folder by default. To keep the project editor (IDE) independent, I've ignored these project files. This way, the project may be imported into any IDE (or used through command line utilities) with ease.
    th13 committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    fa9062e View commit details
    Browse the repository at this point in the history
  5. Fix a typo left over from the original commit of WoodItem.java

    The getter function `getBaseDeliveryTime()` was erroneously named
    `getDaseDeliveryTime()`. This is no longer the case.
    th13 committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    308a8bc View commit details
    Browse the repository at this point in the history
  6. Add WoodType package and create a utility class WoodTyper

    The WoodType package contains classes that extend WoodItem and initialize
    themselves with the appropriate constants (type, base delivery time, and
    price).
    
    The WoodTyper is a static utility class that instatiates a WoodItem based on
    the type of wood. This allows us to easily use one class (WoodItem) to handle
    all of our wood types, but allow them to easily be initialized with the
    required constants.
    th13 committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    6544c5f View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2016

  1. Add additional classes for storing a customer order

    Created several classes to handle an order to be created from an input
    file. In addition, the function to read the input file and convert the
    data into the Order object has been implemented. Finally, an example input
    file has been provided.
    
    In the future, the input file should be available to be input through a
    command line argument.
    th13 committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    ca6a8c6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1df5118 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7b01414 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e1ef46e View commit details
    Browse the repository at this point in the history
  5. Finish implementation of Order output

    Add methods to format the total price string and calculate the estimated
    time of delivery.
    th13 committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    ea562c0 View commit details
    Browse the repository at this point in the history
  6. Allow input file to be specified as a command line argument

    File should be specified as the first command line argument (accessed in the
    code as args[0]). This can also be specified in an IDE by setting the
    program arguments in your build configuration.
    th13 committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    4a6d0bc View commit details
    Browse the repository at this point in the history
Loading