Cleaning the App class

src/main/java/org/luwrain/app/contacts/App.java

@@ -6,7 +6,7 @@
 import org.luwrain.controls.*;
 import org.luwrain.pim.contacts.*;
 
-final class App implements Application
+final class App implements Application, MonoApp
 {
  private Luwrain luwrain = null;
  private Strings strings = null;
@@ -48,8 +48,7 @@ private void createAreas()
  switch(event.getSpecial())
  {
  case TAB:
- luwrain.setActiveArea(valuesArea);
- return true;
+ return AreaLayoutHelper.activateNextArea(luwrain, getAreaLayout(), this);
  case INSERT:
  return actions.insertIntoTree(foldersArea);
  case DELETE:
@@ -61,8 +60,9 @@ private void createAreas()
  }
  @Override public boolean onSystemEvent(EnvironmentEvent event)
  {
- if (event == null)
- throw new NullPointerException("event may not be null");
+ NullCheck.notNull(event, "event");
+ if (event.getType() != EnvironmentEvent.Type.REGULAR)
+ return super.onSystemEvent(event);
  switch(event.getCode())
  {
  case CLOSE:
@@ -74,16 +74,17 @@ private void createAreas()
  }
  };
 
- valuesArea = new FormArea(new DefaultControlContext(luwrain), strings.valuesAreaName()){
+ this.valuesArea = new FormArea(new DefaultControlContext(luwrain), strings.valuesAreaName()){
  @Override public boolean onInputEvent(KeyboardEvent event)
  {
  NullCheck.notNull(event, "event");
  if (event.isSpecial() && !event.isModified())
  switch(event.getSpecial())
  {
  case TAB:
- gotoNotes();
- return true;
+ return AreaLayoutHelper.activateNextArea(luwrain, getAreaLayout(), this);
+ case BACKSPACE:
+ return AreaLayoutHelper.activatePrevArea(luwrain, getAreaLayout(), this);
  case INSERT:
  return actions.insertValue(valuesArea);
  case DELETE:
@@ -95,8 +96,9 @@ private void createAreas()
  }
  @Override public boolean onSystemEvent(EnvironmentEvent event)
  {
- if (event == null)
- throw new NullPointerException("event may not be null");
+ NullCheck.notNull(event, "event");
+ if (event.getType() != EnvironmentEvent.Type.REGULAR)
+ return super.onSystemEvent(event);
  switch(event.getCode())
  {
  case CLOSE:
@@ -111,8 +113,7 @@ private void createAreas()
  final EditAreaOld.Params editParams = new EditAreaOld.Params();
  editParams.context = new DefaultControlContext(luwrain);
  editParams.name = strings.notesAreaName();
-
- notesArea = new EditAreaOld(editParams){
+ this.notesArea = new EditAreaOld(editParams){
  @Override public boolean onInputEvent(KeyboardEvent event)
  {
  if (event == null)
@@ -121,17 +122,17 @@ private void createAreas()
  switch(event.getSpecial())
  {
  case TAB:
- luwrain.setActiveArea(foldersArea);
- return true;
+ return AreaLayoutHelper.activateNextArea(luwrain, getAreaLayout(), this);
  default:
  return super.onInputEvent(event);
  }
  return super.onInputEvent(event);
  }
  @Override public boolean onSystemEvent(EnvironmentEvent event)
  {
- if (event == null)
- throw new NullPointerException("event may not be null");
+ NullCheck.notNull(event, "event");
+ if (event.getType() != EnvironmentEvent.Type.REGULAR)
+ return super.onSystemEvent(event);
  switch(event.getCode())
  {
  case CLOSE:
@@ -144,14 +145,17 @@ private void createAreas()
  };
  }
 
- @Override public AreaLayout getAreaLayout()
+ void ensureEverythingSaved()
  {
- return new AreaLayout(AreaLayout.LEFT_TOP_BOTTOM, foldersArea, valuesArea, notesArea);
+ if (!base.hasCurrentContact())
+ return;
+ base.saveForm(valuesArea);
+ base.saveNotes(notesArea);
  }
 
- void gotoNotes()
+ @Override public AreaLayout getAreaLayout()
  {
- luwrain.setActiveArea(notesArea);
+ return new AreaLayout(AreaLayout.LEFT_TOP_BOTTOM, foldersArea, valuesArea, notesArea);
  }
 
  @Override public void closeApp()
@@ -160,16 +164,14 @@ void gotoNotes()
  luwrain.closeApp();
  }
 
- void ensureEverythingSaved()
+ @Override public String getAppName()
  {
- if (!base.hasCurrentContact())
- return;
- base.saveForm(valuesArea);
- base.saveNotes(notesArea);
+ return strings.appName();
  }
 
- @Override public String getAppName()
+ @Override public MonoApp.Result onMonoAppSecondInstance(Application app)
  {
- return strings.appName();
+ NullCheck.notNull(app, "app");
+ return MonoApp.Result.BRING_FOREGROUND;
  }
 }

src/main/java/org/luwrain/app/contacts/Base.java

@@ -17,8 +17,6 @@ final class Base
  private final StoredContactsFolder foldersRoot;
  private StoredContactsFolder[] folders = new StoredContactsFolder[0];
  private StoredContact currentContact = null;
- private TreeModelSource treeModelSource;
- private TreeArea.Model foldersModel;
 
 Base(Luwrain luwrain, Strings strings)
  {
@@ -48,15 +46,6 @@ boolean hasCurrentContact()
  return currentContact != null;
  }
 
- TreeArea.Model getFoldersModel()
- {
- if (foldersModel != null)
- return foldersModel;
- treeModelSource = new TreeModelSource(storing, strings);
- foldersModel = new CachedTreeModel(treeModelSource);
- return foldersModel;
- }
-
  boolean openFolder(StoredContactsFolder folder)
  {
  return false;