[Logconsole-cvs] LogConsole/logconsole/src/logconsole/filter FilterModel.java,1.1.1.1,1.2 FilterForm.java,1.1.1.1,1.2 FilterBean.java,1.2,1.3

[Bavo De R. <ba...@us...>]

Update of /cvsroot/logconsole/LogConsole/logconsole/src/logconsole/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9403/logconsole/src/logconsole/filter

Modified Files:
	FilterModel.java FilterForm.java FilterBean.java 
Log Message:
Small adjustments to comply to the new PFC api

Index: FilterModel.java
===================================================================
RCS file: /cvsroot/logconsole/LogConsole/logconsole/src/logconsole/filter/FilterModel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FilterModel.java	24 Jun 2004 05:43:56 -0000	1.1.1.1
--- FilterModel.java	23 Nov 2004 11:14:22 -0000	1.2
***************
*** 1,6 ****
  package logconsole.filter;
  
! import portal.comp.DefaultListModel;
! import portal.comp.ListModel;
  import portal.core.model.Model;
  import portal.core.model.SimpleStringModel;
--- 1,9 ----
  package logconsole.filter;
  
! import portal.comp.DefaultListDataModel;
! import portal.comp.DefaultSelectionModel;
! import portal.comp.ListDataModel;
! import portal.comp.SelectionMode;
! import portal.comp.SelectionModel;
  import portal.core.model.Model;
  import portal.core.model.SimpleStringModel;
***************
*** 9,13 ****
  public class FilterModel implements Model
  {
!     public FilterModel()
      {
          loggerName = new SimpleStringModel();
--- 12,18 ----
  public class FilterModel implements Model
  {
!     private static final int DEFAULT_SELECTED_LEVEL = 0;
!     
! 	public FilterModel()
      {
          loggerName = new SimpleStringModel();
***************
*** 16,20 ****
          message = new SimpleStringModel();
  
!         levelList = new DefaultListModel();
  
          levelList.addElement("DEBUG");
--- 21,26 ----
          message = new SimpleStringModel();
  
!         levelList = new DefaultListDataModel();
!         levelSelection = new DefaultSelectionModel(levelList, SelectionMode.SINGLE_SELECTION);
  
          levelList.addElement("DEBUG");
***************
*** 24,28 ****
          levelList.addElement("FATAL");
  
!         levelList.setSelectedIndex(1);
      }
  
--- 30,34 ----
          levelList.addElement("FATAL");
  
!         levelSelection.setSelected(DEFAULT_SELECTED_LEVEL, true);
      }
  
***************
*** 34,38 ****
          message.setString("");
  
!         levelList.setSelectedIndex(1);
      }
  
--- 40,45 ----
          message.setString("");
  
!         levelSelection.clearSelection();
!         levelSelection.setSelected(DEFAULT_SELECTED_LEVEL, true);
      }
  
***************
*** 47,51 ****
      }
  
!     public ListModel getLevelList()
      {
          return levelList;
--- 54,63 ----
      }
  
!     public SelectionModel getLevelSelection()
!     {
!     	return levelSelection;
!     }
!     
!     public ListDataModel getLevelList()
      {
          return levelList;
***************
*** 64,68 ****
      private StringModel loggerName;
      private StringModel resultLimit;
!     private DefaultListModel levelList;
      private StringModel ndc;
      private StringModel message;
--- 76,81 ----
      private StringModel loggerName;
      private StringModel resultLimit;
!     private DefaultListDataModel levelList;
!     private DefaultSelectionModel levelSelection;
      private StringModel ndc;
      private StringModel message;

Index: FilterForm.java
===================================================================
RCS file: /cvsroot/logconsole/LogConsole/logconsole/src/logconsole/filter/FilterForm.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FilterForm.java	24 Jun 2004 05:43:56 -0000	1.1.1.1
--- FilterForm.java	23 Nov 2004 11:14:22 -0000	1.2
***************
*** 22,30 ****
          loggerNameInput =
              new TextInput(new TextInputModel(filterModel.getLoggerName()));
          resultLimitInput =
              new TextInput(new TextInputModel(filterModel.getResultLimit()));
          levelList = new ComboBox(filterModel.getLevelList());
          ndcInput = new TextInput(new TextInputModel(filterModel.getNdc()));
! 		messageInput = new TextInput(new TextInputModel(filterModel.getMessage()));
  
          getContentPanel().setLayout(
--- 22,35 ----
          loggerNameInput =
              new TextInput(new TextInputModel(filterModel.getLoggerName()));
+         
          resultLimitInput =
              new TextInput(new TextInputModel(filterModel.getResultLimit()));
+         
          levelList = new ComboBox(filterModel.getLevelList());
+         levelList.setSelectionModel(filterModel.getLevelSelection());
+         
          ndcInput = new TextInput(new TextInputModel(filterModel.getNdc()));
! 		
!         messageInput = new TextInput(new TextInputModel(filterModel.getMessage()));
  
          getContentPanel().setLayout(

Index: FilterBean.java
===================================================================
RCS file: /cvsroot/logconsole/LogConsole/logconsole/src/logconsole/filter/FilterBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FilterBean.java	27 Jun 2004 17:27:03 -0000	1.2
--- FilterBean.java	23 Nov 2004 11:14:22 -0000	1.3
***************
*** 74,78 ****
                  ">=",
                  new DecimalLiteral(
!                     (filterModel.getLevelList().getSelected() + 1) * 10000));
  
          currentTopExpr = levelExpression;
--- 74,78 ----
                  ">=",
                  new DecimalLiteral(
!                     (filterModel.getLevelSelection().getFirstSelected() + 1) * 10000));
  
          currentTopExpr = levelExpression;