Significantly cleaned up FilterActivity ... fixing indentation issues and
removing unnecessary/old commented code. Also added a "setName" method to
Filter.java
Merge pull request #120 from Tim727/master

Cleaned up FilterActivity and added "setName" method to Filter.java
Merge remote-tracking branch 'upstream/master'
further cleaned up FiltersActivity to make it more readable/welloraganized
Merge pull request #121 from Tim727/master

Further cleaned up FiltersActivity
Merge remote-tracking branch 'upstream/master'
updated ConditionRuleView and TimeRuleViewer to have the appropriate
initializeSaveButton() which resets the tab to the name screen if the
current name is invalid when the user tries to save. I'm also now passing
in an empty filter in the intent from FiltersActivity to
FilterMenuActivity when the "Add Filter" button gets pressed. I've also
move the static field conitions from conditionRuleViewer to
FilterMenuViewer so all of the static fields for that tab menu will be in
the same centralized location. I've also modified the edit text listener
to not automatically update the name of the static field filter if the
name entered is one that is not valid. In addition I have added a static
string field "initialFilterName" to FilterMenuActivity. This field stores
the original name of the filter passed into FilterMenuActivity. This is
used in the updated logic for the edit text listener to ensure that if the
user is viewing an already existing filter and they change the name to
something else and then change the name back to the original name that
there won't be a bug where the program thinks that they've entered in a
name that is already taken.
Merge pull request #122 from Tim727/master

Updated intent in FiltersActivity to use empty filter and modified code in other activities in that tab to refer to filter.getName() instead of the preexisting field "filterName". Also updated the savebutton listeners in TimeRule and ConditionalRule and o
added four methods to Filter.java ... (1) removeConditionRules(), (2)
removeTimeRules, (3) addSetOfConditionRules, (4) addSetOfTimeRules
Merge pull request #125 from Tim727/master

added a few methods to Filter.java because they made my life easier.
modified edit text listener in FilterOptionsActivity to make sure that the
filter name was not being updated unless the changes to the text field
represented a valid/acceptable unique name
Merge pull request #126 from Tim727/master

see comment
modified the edit text listener to do almost all of the checking that was
previously in the save button listener. Also, the code is now making use
of the static field "currentFilterName" instead of filter.getName(). The
edit text listener now only updates the value of currentFilterName if the
name entered passes all the checks (many of which were previously in the
save button listener). This means that the save button listener is now a
lot more simple. All it needs to do is check if the currentFilterName
field is set ... and if it is then it knows that it has a valid name. It
can then update the static "filter" field to have this same name and can
add that filter to the filter list.
Merge pull request #127 from Tim727/master

Implemented usage of currentFilterName static field and also moved most of savebutton listener finctionality into edit text listener. See comment ...
added some minor code in TimeRuleViewer so that a new time rule associated
with the given day will be added to the static field "times" when that
check box is clicked and it will be removed when the check box is
unclicked. Also fixed a bug that was causing the app to crash when trying
to view an existing filter. The issue was that the name being passed in in
the intent from Filters.java for viewing an exisiting filter did not match
the one being passed in for when you were creating a new one ...
Merge pull request #129 from Tim727/master

Fixed bug that was causing app to crash when viewing an exisiting filter ... also layed the groundwork for dynamically adding and removing time rules from the "times" static field ...
reverted back to an older build ... introduced bug with recent updates
that i was not aware of. Those bugs have since been fixed. All checking is
now back in save button listener ... issue was the the edit text had the
right idea but updates every single time a letter is pressed ... which
caused currentFilterName to take on a new value with each press as opposed
to after the user was done typing stuff in. It's actually still doing this
... but i no longer update the value of the name field contigent upon
valid data. I redid the changed to make use of currentFilterName as
opposed to filter.getName ... and also changed the intents in
FiltersActivity to send the same string.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	EclipseProject/src/weatherOracle/activity/ConditionRuleViewerActivity.java
	EclipseProject/src/weatherOracle/activity/FilterMenuActivity.java
	EclipseProject/src/weatherOracle/activity/FilterOptionsActivity.java
	EclipseProject/src/weatherOracle/activity/TimeRuleViewerActivity.java
Merge pull request #131 from Tim727/master

fixed merge confilct
Merge remote-tracking branch 'upstream/master'