[Columba-cvs] columba/src/mail/core/org/columba/mail/folder/search DefaultSearchEngine.java,1.22,1.23

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

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

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

Index: DefaultSearchEngine.java
===================================================================
RCS file: /cvsroot/columba/columba/src/mail/core/org/columba/mail/folder/search/DefaultSearchEngine.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** DefaultSearchEngine.java	22 Aug 2004 15:56:03 -0000	1.22
--- DefaultSearchEngine.java	31 Oct 2004 22:06:55 -0000	1.23
***************
*** 26,30 ****
  
  import org.columba.core.command.StatusObservable;
! import org.columba.core.main.MainInterface;
  import org.columba.core.util.ListTools;
  import org.columba.mail.filter.Filter;
--- 26,30 ----
  
  import org.columba.core.command.StatusObservable;
! import org.columba.core.plugin.PluginManager;
  import org.columba.core.util.ListTools;
  import org.columba.mail.filter.Filter;
***************
*** 117,121 ****
  
          try {
!             AbstractFilterPluginHandler handler = (AbstractFilterPluginHandler) MainInterface.pluginManager.getHandler(
                      "org.columba.mail.filter");
              instance = (AbstractFilter) handler.getActionPlugin(type, null);
--- 117,121 ----
  
          try {
!             AbstractFilterPluginHandler handler = (AbstractFilterPluginHandler) PluginManager.getInstance().getHandler(
                      "org.columba.mail.filter");
              instance = (AbstractFilter) handler.getActionPlugin(type, null);