Cleaning imports

luwrain · May 15, 2024 · c719730 · c719730
1 parent 801849b
commit c719730
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 113 deletions.
diff --git a/src/main/java/org/luwrain/app/mail/App.java b/src/main/java/org/luwrain/app/mail/App.java
@@ -20,17 +20,14 @@
 import org.apache.logging.log4j.*;
 
 import org.luwrain.core.*;
-import org.luwrain.core.events.*;
-import org.luwrain.pim.*;
-import org.luwrain.pim.mail.*;
 import org.luwrain.app.base.*;
 
 public final class App extends AppBase<Strings> implements MonoApp
 {
  static final Logger log = LogManager.getLogger();
 
  private Hooks hooks = null;
- private MailStoring storing = null;
+ // private MailStoring storing = null;
  private Data data = null;
  private Conv conv = null;
  private MainLayout mainLayout = null;
@@ -45,7 +42,7 @@ public App()
  {
  this.hooks = new Hooks(getLuwrain());
  this.data = new Data(getStrings(), new File(getLuwrain().getFileProperty(Luwrain.PROP_DIR_USERHOME), ".luwrain-defaults.conf"));
- this.storing = org.luwrain.pim.Connections.getMailStoring(getLuwrain(), true);
+// this.storing = org.luwrain.pim.Connections.getMailStoring(getLuwrain(), true);
  /*
  if (storing == null)
  return null;
@@ -87,7 +84,7 @@ Layouts layouts()
  return MonoApp.Result.BRING_FOREGROUND;
  }
 
- MailStoring getStoring() { return this.storing; }
+// MailStoring getStoring() { return this.storing; }
  Hooks getHooks() { return this.hooks; }
  Conv getConv() { return conv; }
  public Data getData() { return data; }

diff --git a/src/main/java/org/luwrain/app/mail/Conv.java b/src/main/java/org/luwrain/app/mail/Conv.java
@@ -16,8 +16,6 @@
 
 package org.luwrain.app.mail;
 
-import java.util.*;
-
 import org.luwrain.core.*;
 import static org.luwrain.popups.Popups.*;
 

diff --git a/src/main/java/org/luwrain/app/mail/Data.java b/src/main/java/org/luwrain/app/mail/Data.java
@@ -19,13 +19,12 @@
 import java.util.*;
 import java.io.*;
 
-import org.luwrain.core.*;
-import org.luwrain.pim.mail2.*;
-import org.luwrain.pim.mail2.persistence.dao.*;
-import org.luwrain.pim.mail2.persistence.model.*;
-import org.luwrain.pim.mail2.persistence.*;
+import org.luwrain.pim.mail.*;
+import org.luwrain.pim.mail.persistence.dao.*;
+import org.luwrain.pim.mail.persistence.model.*;
+import org.luwrain.pim.mail.persistence.*;
 
-import static org.luwrain.pim.mail2.FolderProperties.*;
+import static org.luwrain.pim.mail.FolderProperties.*;
 import static org.luwrain.app.mail.App.*;
 import static org.luwrain.util.TextUtils.*;
 

diff --git a/src/main/java/org/luwrain/app/mail/Hooks.java b/src/main/java/org/luwrain/app/mail/Hooks.java
@@ -17,13 +17,10 @@
 package org.luwrain.app.mail;
 
 import java.util.*;
-import org.graalvm.polyglot.*;
 import org.graalvm.polyglot.proxy.*;
 
 import org.luwrain.core.*;
 import org.luwrain.pim.mail.*;
-import org.luwrain.pim.mail2.*;
-//import org.luwrain.pim.mail2.persistence.model.*;
 import org.luwrain.pim.mail.script.*;
 
 import static org.luwrain.script.ScriptUtils.*;
@@ -97,44 +94,4 @@ void makeReply(Message message)
  }
  */
  }
-
- Map<String, MailAccount> server(String mailAddr)
- {
- final Object res = provider(luwrain, SERVERS, new Object[]{mailAddr});
- if (isNull(res))
- return null;
- final Map<String, MailAccount> accounts = new HashMap<>();
- final Object
- smtp = getMember(res, "smtp"),
- pop3 = getMember(res, "pop3");
- if (!isNull(smtp))
- accounts.put("smtp", getAccount(smtp));
- if (!isNull(pop3))
- accounts.put("pop3", getAccount(pop3));
- for(Map.Entry<String, MailAccount> e: accounts.entrySet())
- {
- e.getValue().setLogin(mailAddr);
- e.getValue().setTitle(e.getKey().toUpperCase() + " (" + mailAddr + ")");
- }
- return accounts;
- }
-
- static MailAccount getAccount(Object obj)
- {
- final MailAccount account = new MailAccount();
- account.setHost(asString(getMember(obj, "host")));
- account.setPort(asInt(getMember(obj, "port")));
- final EnumSet<MailAccount.Flags> flags = EnumSet.noneOf(MailAccount.Flags.class);
- final boolean
- ssl = asBoolean(getMember(obj, "ssl")),
- tls = asBoolean(getMember(obj, "tls"));
- if (ssl)
- flags.add(MailAccount.Flags.SSL);
- if (tls)
- flags.add(MailAccount.Flags.TLS);
- flags.add(MailAccount.Flags.ENABLED);
- flags.add(MailAccount.Flags.DEFAULT);
- account.setFlags(flags);
- return account;
- }
 }
diff --git a/src/main/java/org/luwrain/app/mail/MainLayout.java b/src/main/java/org/luwrain/app/mail/MainLayout.java
@@ -23,15 +23,12 @@
 import org.luwrain.controls.*;
 import org.luwrain.controls.ListArea.*;
 import org.luwrain.controls.ListUtils.*;
-import org.luwrain.controls.reader.*;
-import org.luwrain.pim.mail2.*;
+import org.luwrain.pim.mail.*;
 import org.luwrain.app.base.*;
-import org.luwrain.pim.mail2.persistence.model.*;
+import org.luwrain.pim.mail.persistence.model.*;
 import org.luwrain.app.mail.layouts.*;
 
 import static org.luwrain.core.DefaultEventResponse.*;
-import static org.luwrain.app.mail.App.*;
-import static org.luwrain.app.mail.Utils.*;
 
 final class MainLayout extends LayoutBase implements TreeListArea.LeafClickHandler<Folder>, ClickHandler<SummaryItem>
 {

diff --git a/src/main/java/org/luwrain/app/mail/StartingLayout.java b/src/main/java/org/luwrain/app/mail/StartingLayout.java
@@ -21,8 +21,8 @@
 
 import org.luwrain.core.*;
 import org.luwrain.controls.*;
-import org.luwrain.pim.mail.*;
 import org.luwrain.app.base.*;
+import org.luwrain.pim.mail.persistence.model.*;
 
 import org.luwrain.controls.WizardArea.Frame;
 import org.luwrain.controls.WizardArea.WizardValues;
@@ -36,7 +36,7 @@ final class StartingLayout extends LayoutBase
  final Frame introFrame, passwordFrame;
 
  private String mail = "", passwd = "";
- private MailAccount smtp = null, pop3 = null;
+ private Account smtp = null, pop3 = null;
 
  StartingLayout(App app)
  {
@@ -68,7 +68,7 @@ private boolean onMailAddress(WizardValues values)
  app.message(app.getStrings().wizardMailAddrIsInvalid(), Luwrain.MessageType.ERROR);
  return true;
  }
- final Map<String, MailAccount> accounts = app.getHooks().server(mail);
+ final Map<String, Account> accounts = null;//app.getHooks().server(mail);
  if (accounts == null)
  return false;
  this.smtp = accounts.get("smtp");
@@ -90,10 +90,10 @@ private boolean onPassword(WizardValues values)
  }
  this.smtp.setPasswd(password);
  pop3.setPasswd(password);
- NullCheck.notNull(app.getStoring(), "storing");
- NullCheck.notNull(app.getStoring().getAccounts(), "accounts");
- app.getStoring().getAccounts().save(smtp);
- app.getStoring().getAccounts().save(pop3);
+// NullCheck.notNull(app.getStoring(), "storing");
+// NullCheck.notNull(app.getStoring().getAccounts(), "accounts");
+// app.getStoring().getAccounts().save(smtp);
+// app.getStoring().getAccounts().save(pop3);
  app.layouts().main();
  return true;
  }

diff --git a/src/main/java/org/luwrain/app/mail/SummaryItem.java b/src/main/java/org/luwrain/app/mail/SummaryItem.java
@@ -16,8 +16,7 @@
 
 package org.luwrain.app.mail;
 
-import org.luwrain.core.*;
-import org.luwrain.pim.mail2.*;
+import org.luwrain.pim.mail.*;
 
 final class SummaryItem
 {

diff --git a/src/main/java/org/luwrain/app/mail/Utils.java b/src/main/java/org/luwrain/app/mail/Utils.java
@@ -23,7 +23,7 @@
 import org.luwrain.reader.*;
 import org.luwrain.pim.*;
 import org.luwrain.pim.mail.*;
-import org.luwrain.pim.mail2.*;
+import org.luwrain.pim.mail.*;
 import org.luwrain.util.*;
 
 final class Utils

diff --git a/src/main/java/org/luwrain/app/mail/layouts/FolderPropertiesLayout.java b/src/main/java/org/luwrain/app/mail/layouts/FolderPropertiesLayout.java
@@ -19,19 +19,12 @@
 import java.util.*;
 
 import org.luwrain.core.*;
-import org.luwrain.core.events.*;
-import org.luwrain.core.queries.*;
 import org.luwrain.controls.*;
-import org.luwrain.controls.reader.*;
-import org.luwrain.pim.*;
-import org.luwrain.pim.mail.*;
 import org.luwrain.app.base.*;
 import org.luwrain.app.mail.*;
 
-import org.luwrain.pim.mail2.persistence.model.*;
-import org.luwrain.pim.mail2.persistence.dao.*;
-import static org.luwrain.pim.mail2.FolderProperties.*;
-
+import org.luwrain.pim.mail.persistence.model.*;
+import static org.luwrain.pim.mail.FolderProperties.*;
 
 public final class FolderPropertiesLayout extends LayoutBase
 {

diff --git a/src/main/java/org/luwrain/app/message/App.java b/src/main/java/org/luwrain/app/message/App.java
@@ -17,31 +17,20 @@
 package org.luwrain.app.message;
 
 import java.util.*;
-import java.io.*;
 
 import org.luwrain.core.*;
-import org.luwrain.core.events.*;
-import org.luwrain.controls.*;
 import org.luwrain.app.base.*;
-import org.luwrain.pim.*;
 import org.luwrain.pim.mail.*;
-import org.luwrain.pim.mail2.persistence.model.*;
 import org.luwrain.pim.contacts.*;
-import org.luwrain.io.json.*;
 
-import static org.luwrain.pim.mail2.persistence.MailPersistence.*;
-import org.luwrain.pim.mail2.persistence.model.*;
-import org.luwrain.pim.mail2.persistence.dao.*;
-
-import static org.luwrain.pim.mail.BinaryMessage.*;
-import static org.luwrain.pim.mail2.FolderProperties.*;
-import static org.luwrain.core.NullCheck.*;
+import static org.luwrain.pim.mail.persistence.MailPersistence.*;
+import org.luwrain.pim.mail.persistence.model.*;
+import org.luwrain.pim.mail.persistence.dao.*;
 
 public final class App extends AppBase<Strings>
 {
- final Message message;
+ final org.luwrain.io.json.Message message;
  private org.luwrain.pim.mail.Settings sett = null;
- private MailStoring mailStoring = null;
  private FolderDAO folderDAO = null;
  private ContactsStoring contactsStoring = null;
  private Conv conv = null;
@@ -52,19 +41,19 @@ public App()
  this(null);
  }
 
- public App(Message message)
+ public App(org.luwrain.io.json.Message message)
  {
  super(Strings.NAME, Strings.class, "luwrain.message");
- this.message = message != null?message:new Message();
+ this.message = message != null?message:new org.luwrain.io.json.Message();
  }
 
  @Override protected AreaLayout onAppInit()
  {
  this.sett = org.luwrain.pim.mail.Settings.create(getLuwrain().getRegistry());
- this.mailStoring = org.luwrain.pim.Connections.getMailStoring(getLuwrain(), true);
+// this.mailStoring = org.luwrain.pim.Connections.getMailStoring(getLuwrain(), true);
  this.folderDAO = getFolderDAO();
  this.contactsStoring = org.luwrain.pim.Connections.getContactsStoring(getLuwrain(), true);
- if (mailStoring == null || contactsStoring == null)
+ if (contactsStoring == null)
  return null;
  this.conv = new Conv(this);
  this.mainLayout = new MainLayout(this);
@@ -81,7 +70,7 @@ public App(Message message)
  return true;
  }
 
- boolean send(org.luwrain.pim.mail2.Message message, boolean useAnotherAccount)
+ boolean send(org.luwrain.pim.mail.Message message, boolean useAnotherAccount)
  {
  /*
  if (useAnotherAccount)
@@ -141,9 +130,9 @@ private void fillMessageData(Message message)
 
  Conv getConv() { return this.conv; }
  ContactsStoring getContactsStoring() { return this.contactsStoring; }
- MailStoring getMailStoring() { return this.mailStoring; }
+// MailStoring getMailStoring() { return this.mailStoring; }
 
- private String getFromLine(MailAccount account)
+ private String getFromLine(Account account)
  {
  final org.luwrain.core.Settings.PersonalInfo sett = org.luwrain.core.Settings.createPersonalInfo(getLuwrain().getRegistry());
  final String personal;
@@ -154,7 +143,7 @@ private String getFromLine(MailAccount account)
  if (account != null && account.getSubstAddress() != null && !account.getSubstAddress().trim().isEmpty())
  addr = account.getSubstAddress().trim(); else
  addr = sett.getDefaultMailAddress("").trim();
- return mailStoring.combinePersonalAndAddr(personal, addr);
+ return "FIXME";//mailStoring.combinePersonalAndAddr(personal, addr);
  }
 
  private String getUserAgent()

diff --git a/src/main/java/org/luwrain/app/message/Conv.java b/src/main/java/org/luwrain/app/message/Conv.java
@@ -16,16 +16,13 @@
 
 package org.luwrain.app.message;
 
-import java.util.*;
 import java.io.*;
 
 import org.luwrain.core.*;
-import org.luwrain.core.events.*;
 import org.luwrain.popups.*;
 import org.luwrain.pim.*;
-import org.luwrain.pim.mail.*;
-import org.luwrain.pim.contacts.*;
 import org.luwrain.popups.pim.*;
+import org.luwrain.pim.mail.persistence.model.*;
 
 import static org.luwrain.popups.Popups.*;
 
@@ -103,8 +100,9 @@ boolean confirmLaunchingAccountWizard()
  return Popups.confirmDefaultYes(luwrain, "Отправление сообщения", "Учётные записи для отправления почты отсутствуют. Вы хотите добавить новую сейчас?");//FIXME:
  }
 
- MailAccount accountToSend() throws PimException
+ Account accountToSend() throws PimException
  {
+/*
  final MailAccount[] accounts = app.getMailStoring().getAccounts().load();
  final List<MailAccount> items = new ArrayList<>();
  for(MailAccount a: accounts)
@@ -116,6 +114,8 @@ MailAccount accountToSend() throws PimException
  if (res == null)
  return null;
  return (MailAccount)res;
+ */
+return null;
  }
 
  boolean closeModified()

diff --git a/src/main/java/org/luwrain/app/message/MainLayout.java b/src/main/java/org/luwrain/app/message/MainLayout.java
@@ -22,7 +22,7 @@
 import org.luwrain.core.*;
 import org.luwrain.core.events.*;
 import org.luwrain.controls.*;
-import org.luwrain.pim.mail2.*;
+import org.luwrain.pim.mail.*;
 import org.luwrain.io.json.*;
 import org.luwrain.app.base.*;
 import org.luwrain .util.*;
@@ -41,7 +41,7 @@ final class MainLayout extends LayoutBase
  super(app);
  this.app = app;
  this.spellChecking =new FormSpellChecking(getLuwrain());
- final Settings.PersonalInfo sett = Settings.createPersonalInfo(app.getLuwrain().getRegistry());
+ final var sett = org.luwrain.core.Settings.createPersonalInfo(app.getLuwrain().getRegistry());
  final List<String> text = new ArrayList<>();
  if (app.message.getText() != null)
  text.addAll(app.message.getText());
@@ -160,9 +160,9 @@ private boolean isReadyForSending()
  return true;
  }
 
- private org.luwrain.pim.mail2.Message getMailMessage()
+ private org.luwrain.pim.mail.Message getMailMessage()
  {
- final var msg = new org.luwrain.pim.mail2.Message();
+ final var msg = new org.luwrain.pim.mail.Message();
  /*
  msg.setTo(App.splitAddrs(messageArea.getTo()));
  msg.setCc(App.splitAddrs(messageArea.getCc()));