[Columba-cvs] columba/src/mail/core/org/columba/mail/gui/config/filter CriteriaList.java,1.20,1.21 ActionList.java,1.18,1.19

[Frederik D. <fd...@us...>]

Update of /cvsroot/columba/columba/src/mail/core/org/columba/mail/gui/config/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv304/src/mail/core/org/columba/mail/gui/config/filter

Modified Files:
	CriteriaList.java ActionList.java 
Log Message:
[intern]refactoring of main-entrypoints and maininterface accessor classes, using singleton pattern where appropriate

Index: CriteriaList.java
===================================================================
RCS file: /cvsroot/columba/columba/src/mail/core/org/columba/mail/gui/config/filter/CriteriaList.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CriteriaList.java	22 Aug 2004 15:55:18 -0000	1.20
--- CriteriaList.java	31 Oct 2004 22:06:57 -0000	1.21
***************
*** 41,47 ****
  import org.columba.core.gui.util.ImageLoader;
  import org.columba.core.gui.util.NotifyDialog;
- import org.columba.core.main.MainInterface;
  import org.columba.core.plugin.AbstractPluginHandler;
  import org.columba.core.plugin.PluginHandlerNotFoundException;
  import org.columba.mail.filter.Filter;
  import org.columba.mail.filter.FilterCriteria;
--- 41,47 ----
  import org.columba.core.gui.util.ImageLoader;
  import org.columba.core.gui.util.NotifyDialog;
  import org.columba.core.plugin.AbstractPluginHandler;
  import org.columba.core.plugin.PluginHandlerNotFoundException;
+ import org.columba.core.plugin.PluginManager;
  import org.columba.mail.filter.Filter;
  import org.columba.mail.filter.FilterCriteria;
***************
*** 60,64 ****
  
  		try {
! 			pluginHandler = MainInterface.pluginManager
  					.getHandler("org.columba.mail.filter");
  		} catch (PluginHandlerNotFoundException ex) {
--- 60,64 ----
  
  		try {
! 			pluginHandler = PluginManager.getInstance()
  					.getHandler("org.columba.mail.filter");
  		} catch (PluginHandlerNotFoundException ex) {

Index: ActionList.java
===================================================================
RCS file: /cvsroot/columba/columba/src/mail/core/org/columba/mail/gui/config/filter/ActionList.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ActionList.java	22 Aug 2004 15:55:18 -0000	1.18
--- ActionList.java	31 Oct 2004 22:06:57 -0000	1.19
***************
*** 44,47 ****
--- 44,48 ----
  import org.columba.core.main.MainInterface;
  import org.columba.core.plugin.PluginHandlerNotFoundException;
+ import org.columba.core.plugin.PluginManager;
  import org.columba.mail.filter.Filter;
  import org.columba.mail.filter.FilterAction;
***************
*** 136,140 ****
          try {
              pluginHandler = (FilterActionPluginHandler)
!                 MainInterface.pluginManager.getHandler(
                      "org.columba.mail.filteraction");
          } catch (PluginHandlerNotFoundException ex) {
--- 137,141 ----
          try {
              pluginHandler = (FilterActionPluginHandler)
! PluginManager.getInstance().getHandler(
                      "org.columba.mail.filteraction");
          } catch (PluginHandlerNotFoundException ex) {