New TreeArea interface

luwrain · Mar 12, 2016 · 1d50c99 · 1d50c99
1 parent ca1d8a5
commit 1d50c99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/org/luwrain/app/contacts/Base.java b/src/main/java/org/luwrain/app/contacts/Base.java
@@ -17,7 +17,7 @@ class Base
  private ContactsStoring storing;
  private StoredContact currentContact = null;
  private TreeModelSource treeModelSource;
- private TreeModel foldersModel;
+ private TreeArea.Model foldersModel;
 
  boolean init(Luwrain luwrain, Strings strings)
  {
@@ -43,7 +43,7 @@ boolean hasCurrentContact()
  return currentContact != null;
  }
 
- TreeModel getFoldersModel()
+ TreeArea.Model getFoldersModel()
  {
  if (foldersModel != null)
  return foldersModel;

diff --git a/src/main/java/org/luwrain/app/contacts/ContactsApp.java b/src/main/java/org/luwrain/app/contacts/ContactsApp.java
@@ -113,9 +113,12 @@ private void createAreas()
  final Actions actions = this;
  final Strings s = strings;
 
- foldersArea = new TreeArea(new DefaultControlEnvironment(luwrain),
- base.getFoldersModel(),
- strings.foldersAreaName()){
+ final TreeArea.Params treeParams = new TreeArea.Params();
+ treeParams.environment = new DefaultControlEnvironment(luwrain);
+ treeParams.model = base.getFoldersModel();
+ treeParams.name = strings.foldersAreaName();
+
+ foldersArea = new TreeArea(treeParams) {
  @Override public boolean onKeyboardEvent(KeyboardEvent event)
  {
  NullCheck.notNull(event, "event");