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: ReubenAFrank/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.
  • 16 commits
  • 5 files changed
  • 2 contributors

Commits on Feb 22, 2016

  1. -Subject: Edited README.txt and removed REMOVE.txt

    Added my name and netID to first 2 lines of README.txt to show ownership.
    ReubenAFrank committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    4e6237c View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2016

  1. -Added book.txt

    Contains a paragraph of lorem ipsum
    ReubenAFrank committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    7d6bf99 View commit details
    Browse the repository at this point in the history
  2. -removed book.txt

    ReubenAFrank committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    67b6603 View commit details
    Browse the repository at this point in the history
  3. -added back book.txt

    contains lorem ipsum and output of git status before changes committed
    ReubenAFrank committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    9573d38 View commit details
    Browse the repository at this point in the history
  4. -added answers.txt

    file filled with questions about git
    ReubenAFrank committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    ba239a7 View commit details
    Browse the repository at this point in the history
  5. -HardwoodSeller.java the main program driver

    Added file reading and storage of input data.
    ReubenAFrank committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    1a94f79 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2016

  1. -continued constructing the main driver class

    Added calculation of delivery time and price, updated printing statements
    ReubenAFrank committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    084a1e9 View commit details
    Browse the repository at this point in the history
  2. -Refactored folders

    Moved WoodItem.java to the same folder as HardwoodSeller.java to make execution from the command line possible.
    ReubenAFrank committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    a65ad69 View commit details
    Browse the repository at this point in the history
  3. -worked around classpath/import problems in HardwoodSeller

    Added contents of WoodItem.java to HardwoodSeller.java, as a package protected class.
    ReubenAFrank committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    1eeb6fa View commit details
    Browse the repository at this point in the history
  4. -began testing

    Removed package statement and added a text input file to same directory as HardwoodSeller
    ReubenAFrank committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    cb8de79 View commit details
    Browse the repository at this point in the history
  5. -refined file io

    used nextline() and split statement to process the input instead of the previously used Scanner next() method
    ReubenAFrank committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    aacebbf View commit details
    Browse the repository at this point in the history
  6. -Updated README.txt finished HardwoodSeller. Completion of assignment!

    Added compilation and running instructions in README.txt, as well as finished input reading and output format for HardwoodSeller.java.
    Polished methods that did calculation in HardwoodSeller as well.
    ReubenAFrank committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    3b6ec95 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2016

  1. Update answers.txt

    Inserted the actual answer to each question.
    ReubenAFrank committed Mar 27, 2016
    Configuration menu
    Copy the full SHA
    07e156f View commit details
    Browse the repository at this point in the history
  2. Update answers.txt

    Tweaked answer to part (e)
    ReubenAFrank committed Mar 27, 2016
    Configuration menu
    Copy the full SHA
    fc17c37 View commit details
    Browse the repository at this point in the history
  3. Update answers.txt

    Fixed spacing to some extent
    ReubenAFrank committed Mar 27, 2016
    Configuration menu
    Copy the full SHA
    ddedbb9 View commit details
    Browse the repository at this point in the history
  4. Update answers.txt

    fixed a minor error in part (d)
    ReubenAFrank committed Mar 27, 2016
    Configuration menu
    Copy the full SHA
    a98b8dd View commit details
    Browse the repository at this point in the history
Loading