Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Let's Try This Again... #2

Merged
merged 84 commits into from

2 participants

@nathanh89

Now that my commit history is attached, I formally request you pull on my fork. I will not stop making that joke. Also, this is irrelevant but I am typing so much faster than the computer is rendering right now I'm about thirty seconds ahead.

BudgetBoss works here, mostly. It's a good jumping off point (I think) for future changes under your more direct supervision..and with the branch/change/merge method of adding new features it's a good place to start. Anyway I've spent enough time playing around with git in the command line, I'm gonna go read now.

nathanh89 added some commits
@nathanh89 nathanh89 Initial commit 683aece
@nathanh89 nathanh89 Moved over from training repo 7ad32d5
@nathanh89 nathanh89 Refactored SO MUCH - though the code isn't quite working yet... 75018d7
@nathanh89 nathanh89 Getting closer to finishing refactoring... 36a8572
@nathanh89 nathanh89 Finished a round of refactoring, code works again in console, now to …
…modify tests
f656e5c
@nathanh89 nathanh89 Fixed two broken tests 9fe35ea
@nathanh89 nathanh89 Couple of code modifications, updated To-Do list ba8a7e3
@nathanh89 nathanh89 Initial stage of adding ability to set user-defined path afdf5a4
@nathanh89 nathanh89 Working on user ability to input a path 332fd73
@nathanh89 nathanh89 Not done finishing file operations yet, but there's a storm coming. L…
…iterally. Committing.
345f1b9
@nathanh89 nathanh89 Inputting a directory to search for Budgets in works flawlessly, so f…
…ar as I can tell.
a1e2746
@nathanh89 nathanh89 Choosing save/load directories works well, as does saving itself. Loa…
…ding not yet implemented. Needs some serious refactoring.
93f498f
@nathanh89 nathanh89 Adjusted package structure, added two classes for refactoring, and pa…
…ckages for expansion of future features.
df040f1
@nathanh89 nathanh89 More or less done with Opener, pulled from PrompterLogic, integrated …
…into BudgetBoss. Next up, TheCreator.
a15cfe1
@nathanh89 nathanh89 Finished adding Opener and TheCreator, scrapped PrompterLogic e1e9e33
@nathanh89 nathanh89 Worked some bugs out of the last commit that I found 172bc35
@nathanh89 nathanh89 File operations are pretty much done, for now. Can open/load Budgets …
…from any directory where they've been saved, can save modified or new ones in any directory.
b355332
@nathanh89 nathanh89 Addressed 2nd issue from THAT DICK IN QA, other small tweaks 7bd2c9e
@nathanh89 nathanh89 Partway through refactoring prompts to a properties file, but it be d…
…inner time
a6fbf33
@nathanh89 nathanh89 Finished initial implementation of cliOutput.properties file for prom…
…pts, killed off ConsoleOutput class
50b0c24
@nathanh89 nathanh89 Fixed bug that allowed users to save to a directory not ending in / m…
…essing up the filenames and desired save directory
28a66b7
@nathanh89 nathanh89 MainMenu has begun! Currently you can only save or exit, though. Remo…
…ved the autoSave method from the end of the main program, and changed that method name to saveBudget
4ed9541
@nathanh89 nathanh89 Added basic ability to print what little of the Budget there is to th…
…e console
b492faf
@nathanh89 nathanh89 Working on BudgetEditor main menu, can print and edit budget name, cu…
…rrently
78d799e
@nathanh89 nathanh89 Basic Main Menu and Main Editor Menu functionality is in place. Need …
…to spend some time refactoring at this point
fe38702
@nathanh89 nathanh89 Added MainMenuOption interface, adapted main menu methods to an array…
… of MainMenuOptions, user input is passed as index to call desired option. Going to do the same thing to the editor
cc8f7f0
@nathanh89 nathanh89 Modified YOrN vlidator and Path validator, modified Salvation to work…
… with new methods. Need to fix Opener and TheCreator
8071044
@nathanh89 nathanh89 Close to finishing refactor. Code currently not working, but it's bee…
…n an hour since my last commit, so...being careful
12828da
@nathanh89 nathanh89 New validators in place and I'm back to just having the duplicate ent…
…ry request. Gonna track that down
374f9f3
@nathanh89 nathanh89 Code seems to be working, brining a potential end to the massive refa…
…ctoring. At this point though, I think it would be prudent to add some tests to be sure and some more console tests will probably be run as well
608fbb7
@nathanh89 nathanh89 added new InputValidator test, exposed a typo in properties files tha…
…t is fixed
dd5bf1b
@nathanh89 nathanh89 Fixed another typo in cliOutput, added a couple more validator tests 5e8d0e8
@nathanh89 nathanh89 Fixed a small error caused by an oversight when not loading a budget 802da22
@nathanh89 nathanh89 Worked the lastfew known bugs out of the code from the refactor. Code…
… is working! FUCK YA! So far as I know. Must write more tests tomorrow.
10700ce
@nathanh89 nathanh89 Added a VERY basic Budget-to-JSON converter class, tested with a demo…
… run. So far so good.
22366c4
@nathanh89 nathanh89 Updated To-Do list, seperated implemented features, added FeatureRequ…
…ests to record exact wording of requested features
02a61a0
@nathanh89 nathanh89 Added MasterBudget and LineItem interfaces, not doing anything with t…
…hem as of yet...
4b5fda5
@nathanh89 nathanh89 Added JodaTime to build path, changed Date fields in interfaces to Lo…
…calDate
cd1972a
@nathanh89 nathanh89 Replaced String dates in Budget with LocalDate from Joda-Time, fixed …
…get/set/print methods that broke, added class DateConverter
73bc307
@nathanh89 nathanh89 Removed an import and a JUnit test case. Smallest commit ever award. 73aec8f
@nathanh89 nathanh89 Moved prompting responsibility from BudgetBoss to Prompter 85cfd29
@nathanh89 nathanh89 Standardized the way all classes get input, now from a static Listene…
…r method
d0535e8
@nathanh89 nathanh89 First run of the code I've done since starting on Opener that appears…
… to work. Going to test more
c48b485
@nathanh89 nathanh89 Satisfied with Opener/InputValidator functionality...for now. Next to…
… fix: some problems with Salvation.
9379c17
@nathanh89 nathanh89 Salvation is working correctly b84cc9d
@nathanh89 nathanh89 Added MasterMenu interface so both (and any future) menus/menu select…
…ions can be validated with the same InputValidator method, validatesMenuChoice
9891262
@nathanh89 nathanh89 Made Budget extend MasterBudget, added several classes/test cases to …
…work on today for expanding Budget functionality
4a0d049
@nathanh89 nathanh89 Started on Expense/ExpenseCategory, Ubuntu is bugging to restart from…
… updates
e52a232
@nathanh89 nathanh89 Passed first ExpenseCategory test 27ba6c1
@nathanh89 nathanh89 Adding ability to load different Budget in same instance of BudgetBos…
…s, modified the menu, updated some CLI prompts, added 0 check for menu choices
629bfce
@nathanh89 nathanh89 BudgetBoss MainMenu comes up on program launch now, need to add some …
…checks to make sure you can't edit the defaultBudget, but for now you can load a budget, then load a different one
4a8ad3d
@nathanh89 nathanh89 BudgetBoss launches with MainMenu now, and can swap budgets without h…
…aving to exit and restart
47fa22c
@nathanh89 nathanh89 You can exit from initial MainMenu, or load a budget. Anything else w…
…ill prompt you first to open a saved budget, then to create one
55865d6
@nathanh89 nathanh89 Finished first iteration of the validator method for date inputs, add…
…ed check to program
741a874
@nathanh89 nathanh89 Removed methods no longer necessary in Opener and Creator, separated …
…process of opening a budget from creating a budget on the MainMenu
a812026
@nathanh89 nathanh89 BudgetBoss no longer prompts to open a budget on an invalid menu sele…
…ction
6784253
@nathanh89 nathanh89 Various prompt tweaks, fixed BudgetEditor to work with new validator …
…method
2c3d6c9
@nathanh89 nathanh89 Removed last y/n prompt, and removed validator method. Salvation now …
…directly prompts for save directory, removed irrelevant test
372caab
@nathanh89 nathanh89 Sets default direcotry on successful save, shows currently opened bud…
…get on editor menu, added global 'exit' command to end program
94f2ba7
@nathanh89 nathanh89 Added ability to print budget toString() to a text file 38dc7b1
@nathanh89 nathanh89 Fixed BudgetEditor menu's response to 'exit' added screen clearing wh…
…en a menu is displayed
16bb211
@nathanh89 nathanh89 Clears screen on program start a56349b
@nathanh89 nathanh89 Added .gitignore 2c84b75
@nathanh89 nathanh89 Testing that I successfully un-tracked the right files... e443e00
@nathanh89 nathanh89 Renamed Prompter to Printer, moved printFoundBudgets to it cc91aa4
@nathanh89 nathanh89 So much happened...most of it related to making the Menus more cohesi…
…ve and dynamic
ef1bd30
@nathanh89 nathanh89 Refactored/reorganized packages 79fa5f1
@nathanh89 nathanh89 Added test case for Budginator conversion 4497368
@nathanh89 nathanh89 Dates no longer set to a default, user has to set them bbc472a
@nathanh89 nathanh89 Moved crappy check from InputValidator to individual menu options so …
…I don't have to mess with the Validator every time I add a menu option
ca78d26
@nathanh89 nathanh89 Invalid menu entries now trigger a reprint of the menu with the error…
… message at the bottom, prompting for another input
e65c5ee
@nathanh89 nathanh89 Added some screen clears for prettiness purposes 306d685
@nathanh89 nathanh89 About to refactor global exit command and I'm mildly afraid. So I'm c…
…ommitting whatever small tweaks I've done to the code in the last couple hours
2aab366
@nathanh89 nathanh89 Making serious headway with features lists, still not done updating t…
…hough
8aca7c1
@nathanh89 nathanh89 Fixed broken links in features documentation 011d8da
@nathanh89 nathanh89 Just kidding, now I fixed the links in both files 76e2d6d
@nathanh89 nathanh89 Last attempt at correct links for now - not really that important 06a2198
@nathanh89 nathanh89 Closing in on finishing documentation...still need to do EditorMenu f…
…eatures
bed91b2
@nathanh89 nathanh89 Fuck it. Updating feature lists is mind-numbing. Presenting BudgetBos…
…s 0.0.1.
a433bf9
@nathanh89 nathanh89 Added ability to differentiate between Windows and Linus environments…
… in path generation. I'll be working on Windows 7 now.
b726a3c
@nathanh89 nathanh89 Modified Printer to work with Windows or Linux path names 512891c
@nathanh89 nathanh89 Made several classes uninstantiable 8a9257b
@nathanh89 nathanh89 Last working state of BudgetBoss - first thing to be done is fix List…
…ener
1482f35
@nathanh89 nathanh89 Code functions, Listener needs some love, added in the .gitIgnore I f…
…orgot
a84375d
@leadVisionary leadVisionary merged commit 46b4f4e into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 8, 2012
  1. @nathanh89

    Initial commit

    nathanh89 authored
  2. @nathanh89
  3. @nathanh89
  4. @nathanh89
  5. @nathanh89
  6. @nathanh89

    Fixed two broken tests

    nathanh89 authored
  7. @nathanh89
  8. @nathanh89
  9. @nathanh89
  10. @nathanh89
  11. @nathanh89
Commits on Nov 9, 2012
  1. @nathanh89

    Choosing save/load directories works well, as does saving itself. Loa…

    nathanh89 authored
    …ding not yet implemented. Needs some serious refactoring.
  2. @nathanh89

    Adjusted package structure, added two classes for refactoring, and pa…

    nathanh89 authored
    …ckages for expansion of future features.
  3. @nathanh89

    More or less done with Opener, pulled from PrompterLogic, integrated …

    nathanh89 authored
    …into BudgetBoss. Next up, TheCreator.
  4. @nathanh89
  5. @nathanh89
Commits on Nov 10, 2012
  1. @nathanh89

    File operations are pretty much done, for now. Can open/load Budgets …

    nathanh89 authored
    …from any directory where they've been saved, can save modified or new ones in any directory.
  2. @nathanh89
  3. @nathanh89
  4. @nathanh89

    Finished initial implementation of cliOutput.properties file for prom…

    nathanh89 authored
    …pts, killed off ConsoleOutput class
  5. @nathanh89

    Fixed bug that allowed users to save to a directory not ending in / m…

    nathanh89 authored
    …essing up the filenames and desired save directory
  6. @nathanh89

    MainMenu has begun! Currently you can only save or exit, though. Remo…

    nathanh89 authored
    …ved the autoSave method from the end of the main program, and changed that method name to saveBudget
Commits on Nov 11, 2012
  1. @nathanh89
  2. @nathanh89
  3. @nathanh89

    Basic Main Menu and Main Editor Menu functionality is in place. Need …

    nathanh89 authored
    …to spend some time refactoring at this point
  4. @nathanh89

    Added MainMenuOption interface, adapted main menu methods to an array…

    nathanh89 authored
    … of MainMenuOptions, user input is passed as index to call desired option. Going to do the same thing to the editor
  5. @nathanh89

    Modified YOrN vlidator and Path validator, modified Salvation to work…

    nathanh89 authored
    … with new methods. Need to fix Opener and TheCreator
  6. @nathanh89

    Close to finishing refactor. Code currently not working, but it's bee…

    nathanh89 authored
    …n an hour since my last commit, so...being careful
  7. @nathanh89

    New validators in place and I'm back to just having the duplicate ent…

    nathanh89 authored
    …ry request. Gonna track that down
Commits on Nov 12, 2012
  1. @nathanh89

    Code seems to be working, brining a potential end to the massive refa…

    nathanh89 authored
    …ctoring. At this point though, I think it would be prudent to add some tests to be sure and some more console tests will probably be run as well
  2. @nathanh89
  3. @nathanh89
  4. @nathanh89
  5. @nathanh89

    Worked the lastfew known bugs out of the code from the refactor. Code…

    nathanh89 authored
    … is working! FUCK YA! So far as I know. Must write more tests tomorrow.
  6. @nathanh89
Commits on Nov 13, 2012
  1. @nathanh89

    Updated To-Do list, seperated implemented features, added FeatureRequ…

    nathanh89 authored
    …ests to record exact wording of requested features
  2. @nathanh89
  3. @nathanh89
  4. @nathanh89

    Replaced String dates in Budget with LocalDate from Joda-Time, fixed …

    nathanh89 authored
    …get/set/print methods that broke, added class DateConverter
  5. @nathanh89
Commits on Nov 14, 2012
  1. @nathanh89
  2. @nathanh89
  3. @nathanh89

    First run of the code I've done since starting on Opener that appears…

    nathanh89 authored
    … to work. Going to test more
  4. @nathanh89

    Satisfied with Opener/InputValidator functionality...for now. Next to…

    nathanh89 authored
    … fix: some problems with Salvation.
  5. @nathanh89
  6. @nathanh89

    Added MasterMenu interface so both (and any future) menus/menu select…

    nathanh89 authored
    …ions can be validated with the same InputValidator method, validatesMenuChoice
Commits on Nov 15, 2012
  1. @nathanh89

    Made Budget extend MasterBudget, added several classes/test cases to …

    nathanh89 authored
    …work on today for expanding Budget functionality
  2. @nathanh89
  3. @nathanh89
  4. @nathanh89

    Adding ability to load different Budget in same instance of BudgetBos…

    nathanh89 authored
    …s, modified the menu, updated some CLI prompts, added 0 check for menu choices
  5. @nathanh89

    BudgetBoss MainMenu comes up on program launch now, need to add some …

    nathanh89 authored
    …checks to make sure you can't edit the defaultBudget, but for now you can load a budget, then load a different one
  6. @nathanh89
  7. @nathanh89

    You can exit from initial MainMenu, or load a budget. Anything else w…

    nathanh89 authored
    …ill prompt you first to open a saved budget, then to create one
  8. @nathanh89
  9. @nathanh89

    Removed methods no longer necessary in Opener and Creator, separated …

    nathanh89 authored
    …process of opening a budget from creating a budget on the MainMenu
  10. @nathanh89
  11. @nathanh89
Commits on Nov 16, 2012
  1. @nathanh89

    Removed last y/n prompt, and removed validator method. Salvation now …

    nathanh89 authored
    …directly prompts for save directory, removed irrelevant test
  2. @nathanh89

    Sets default direcotry on successful save, shows currently opened bud…

    nathanh89 authored
    …get on editor menu, added global 'exit' command to end program
  3. @nathanh89
  4. @nathanh89
Commits on Nov 17, 2012
  1. @nathanh89
  2. @nathanh89

    Added .gitignore

    nathanh89 authored
  3. @nathanh89
  4. @nathanh89
  5. @nathanh89
Commits on Nov 18, 2012
  1. @nathanh89
  2. @nathanh89
  3. @nathanh89
  4. @nathanh89

    Moved crappy check from InputValidator to individual menu options so …

    nathanh89 authored
    …I don't have to mess with the Validator every time I add a menu option
  5. @nathanh89

    Invalid menu entries now trigger a reprint of the menu with the error…

    nathanh89 authored
    … message at the bottom, prompting for another input
  6. @nathanh89
  7. @nathanh89

    About to refactor global exit command and I'm mildly afraid. So I'm c…

    nathanh89 authored
    …ommitting whatever small tweaks I've done to the code in the last couple hours
Commits on Nov 19, 2012
  1. @nathanh89
  2. @nathanh89
  3. @nathanh89
  4. @nathanh89
  5. @nathanh89
  6. @nathanh89
Commits on Nov 30, 2012
  1. @nathanh89

    Added ability to differentiate between Windows and Linus environments…

    nathanh89 authored
    … in path generation. I'll be working on Windows 7 now.
  2. @nathanh89
  3. @nathanh89
Commits on Jan 9, 2013
  1. @nathanh89
  2. @nathanh89
Something went wrong with that request. Please try again.