Chris Beams
a392d78fc2
Rename NetworkSettingsViewCB => NetworkSettingsView
2014-11-25 22:08:28 +01:00
Chris Beams
4eb1b3994e
Eliminate *CB suffixes on View variable names
2014-11-25 22:08:28 +01:00
Chris Beams
00dce517ee
Rename remaining *Pm.java files => *ViewModel.java
2014-11-25 22:08:27 +01:00
Chris Beams
312b846769
Rename BasicView => AbstractView
2014-11-25 22:08:27 +01:00
Chris Beams
1e59f9bf63
Rename ChildOf => ChildView
2014-11-25 22:08:27 +01:00
Chris Beams
961ec9b317
Rename View => BasicView and extract View interface
2014-11-25 22:08:26 +01:00
Chris Beams
55036b04c6
Rename AccountSetup{View => Wizard}
2014-11-25 22:08:26 +01:00
Chris Beams
693e95391a
Rename Wizard.Step#useSettingsContext => hideWizardNavigation
2014-11-25 22:08:10 +01:00
Chris Beams
d4eb252973
Remove parent field from base View, introduce Wizard
...
- Replace MultiStepNavigation and ContextAware with Wizard and Wizard.Step
- Introduce ChildOf interface
- Eliminate TradeNavigator in favor of depending directly on TradeView
2014-11-25 22:08:09 +01:00
Chris Beams
4ae9868ee5
Move View#TITLE_KEY to MainView
2014-11-25 22:08:08 +01:00
Chris Beams
d02ddd6946
Remove notion of 'childController' from View hierarchy
2014-11-25 22:08:01 +01:00
Chris Beams
02bf6f673d
Fix compilation failure--return View from loadView
2014-11-25 22:08:00 +01:00
Chris Beams
00552399d7
Refine View hierarchy
2014-11-25 22:08:00 +01:00
Chris Beams
7435e1890a
Refine initializ/activate/deactivate lifecycle methods
...
... and eliminate terminate entirely
2014-11-25 22:07:59 +01:00
Chris Beams
97817aa724
Remove all but the last implementation of View#terminate
2014-11-25 22:07:59 +01:00
Chris Beams
22443900a9
Remove CloseListener
2014-11-25 22:07:58 +01:00
Chris Beams
f4b35ba48b
Fix compilation errors
2014-11-25 22:07:58 +01:00
Chris Beams
5f69f84f85
Refactor gui.main.Main* to use new View/Model infra.
2014-11-25 22:07:57 +01:00
Chris Beams
b0c5e14e1a
Enforce non-nullity for delegate objects
2014-11-25 22:07:56 +01:00
Chris Beams
16c9539597
Use 'delegate' naming consistently
2014-11-25 22:07:56 +01:00
Chris Beams
b755b3fad3
Rename *Model => *DataModel
2014-11-25 22:07:55 +01:00
Chris Beams
608f515b89
Rename *PM => *ViewModel
2014-11-25 22:07:55 +01:00
Chris Beams
a7fe05de00
Rename CachedView => ActivatableView
2014-11-25 22:07:54 +01:00
Chris Beams
71e2010a87
Rename *ViewCB => *View
2014-11-25 22:07:54 +01:00
Chris Beams
4e6134a3a2
Declare (Cached)ViewCB classes abstract
2014-11-25 22:07:54 +01:00
Chris Beams
892e3c33f9
Introduce Activatable#NOOP_INSTANCE
...
... and use it instead of CachedViewCB#EMPTY_MODEL
2014-11-25 22:07:53 +01:00
Chris Beams
eb310baae0
Remove null checks in CachedViewCB activation methods
...
... as model can never be null
2014-11-25 22:07:53 +01:00
Chris Beams
d660b74b13
Remove unnecessary calls to super() in view classes
2014-11-25 22:07:52 +01:00
Chris Beams
ba66845c74
Apply template methods to CachedViewCB's Activatable methods
...
... and remove empty lifecycle methods in view classes
2014-11-25 22:07:30 +01:00
Chris Beams
a157c09997
Allow ViewCB's generic M parameter to be of any type
...
... and begin implementing CachedViewCB#EMPTY_MODEL support
2014-11-23 05:14:39 +01:00
Manfred Karrer
e7f52c0795
Merge remote-tracking branch 'origin/master'
2014-11-22 20:27:12 +01:00
Manfred Karrer
ecd8712afd
Reactivate success and null check
2014-11-22 20:27:06 +01:00
Chris Beams
d6150c22a0
Update instructions for building from source
2014-11-22 16:48:19 +01:00
Chris Beams
21b4fc7019
Introduce Model and accept it as generic param to ViewCB
2014-11-22 14:52:54 +01:00
Chris Beams
cc2de07901
Refactor everything
2014-11-22 13:44:41 +01:00
Chris Beams
de82cfb1d6
Make PresentationModel abstract
2014-11-22 12:20:45 +01:00
Chris Beams
100ee01fda
Remove generic model parameter from ViewCB
...
Push the presentation model field down into CachedViewCB--that is the
only place it is actually used from.
2014-11-22 11:52:20 +01:00
Chris Beams
feb891b0dc
Remove #initialize method from model classes
...
... in favor of initialization via constructors. It's fine to break out
a separate private initialization method, but it appears to be
unnecessary to formally model an initialization lifecycle distinct from
construction.
2014-11-22 11:32:18 +01:00
Chris Beams
c7e98df174
Remove #terminate method from base model classes
...
After removing all empty implementations of lifecycle methods (see
earlier commit), the #terminate method was no longer called anywhere
other than from CachedViewCB's #terminate method, which per its own
Javadoc is supposed to call #deactivate. Now it does just that.
2014-11-22 11:32:18 +01:00
Chris Beams
0f04bd58bc
Make model classes package-private
2014-11-22 11:32:18 +01:00
Chris Beams
d0724d707a
Rename *AccountPm => *AccountPM for consistency
2014-11-22 11:32:17 +01:00
Chris Beams
10cca4f844
Remove empty lifecycle methods in gui model classes
2014-11-22 11:32:17 +01:00
Chris Beams
1551d09cf0
Use public constructors in gui model classes
2014-11-22 11:32:16 +01:00
Chris Beams
dd4851440b
Remove unused Logger fields from gui model classes
2014-11-22 11:32:16 +01:00
Chris Beams
29e0564f5a
Remove section comments from gui model classes
2014-11-22 11:32:15 +01:00
Chris Beams
0bf7999e8d
Optimize imports
2014-11-22 11:32:15 +01:00
Chris Beams
5d1fb36069
Hard-code path JDK in package/windows.bat
2014-11-22 09:04:02 +01:00
Chris Beams
84c7de24aa
Revert "Add java home path"
...
This reverts commit 02d3dd2258
2014-11-22 08:40:32 +01:00
Manfred Karrer
dca19708b6
Make amount tx field selectable
2014-11-21 20:07:31 +01:00
Chris Beams
30c0ade5f9
Merge branch 'cbeams'
...
Significant changes in the way that controllers and models interact with
backend services. Most important is the introduction of RxJava's
Observable. See individual commit comments for details.
Conflicts were minor, mainly dealing with the fact that MainPM had been
modified in master, but removed completely on the 'cbeams' branch. All
changes have been preserved by carrying them over to MainModel.
* cbeams:
Improve service initialization coordination using rx.Observable
Redesign controller/model types and apply to gui.main.Main*
Conflicts:
build.gradle
src/main/java/io/bitsquare/btc/WalletService.java
src/main/java/io/bitsquare/gui/main/MainPM.java
src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
2014-11-21 10:37:05 +01:00
