Update of /cvsroot/openbroad/openbroad/src/org/openbroad/client/admin/view/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12268
Modified Files:
UserModel.java
Log Message:
Code cleanup and formatting. (It needed it)
Index: UserModel.java
===================================================================
RCS file: /cvsroot/openbroad/openbroad/src/org/openbroad/client/admin/view/model/UserModel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** UserModel.java 15 Apr 2004 12:36:19 -0000 1.1.1.1
--- UserModel.java 5 May 2004 08:11:35 -0000 1.2
***************
*** 16,27 ****
*/
-
package org.openbroad.client.admin.view.model;
- import java.util.*;
- import java.rmi.*;
- import javax.ejb.*;
- import javax.naming.*;
-
import java.util.ResourceBundle;
import java.util.Vector;
--- 16,21 ----
***************
*** 36,153 ****
public class UserModel extends DefaultTableModel
{
!
! public UserModel()
! {
! header = new String[]
! {
! java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("username"),
! // java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("password"),
! java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("name"),
! java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("address"),
! java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("company"),
! java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("phone"),
! java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("email")
! // java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("fax"),
! // java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("url")
! };
!
! // try
! // {
! //
! // Context ctx = new InitialContext();
! // Object temp = ctx.lookup("ejb/session/stateless/User");
! // userRemoteHome = (UserStatelessRemoteHome) PortableRemoteObject.narrow(temp,UserStatelessRemoteHome.class);
! // userRemote = userRemoteHome.create();
! //
! // } catch (ClassCastException e)
! // {
! // e.printStackTrace();
! // }
! // catch (NamingException e)
! // {
! // e.printStackTrace();
! // }
! // catch(CreateException e)
! // {
! // e.printStackTrace();
! // }
! // catch(RemoteException e)
! // {
! // e.printStackTrace();
! // }
!
! getData();
! }
!
! public void getData()
! {
! setRowCount(0);
!
! DataHolder.getInstance().refreshUser();
!
! userArray = DataHolder.getInstance().getUserList();
!
! for(int i=0;i<userArray.length;i++)
! {
!
! User user = (User)userArray[i];
!
!
! if( user != null )
! {
! Vector u = new Vector();
! u.add(user);
! // u.add(user.getPassword());
! u.add(user.getName());
! u.add(user.getAddress());
! // System.out.println("adress:" +user.getAddress());
! u.add(user.getCompany());
! u.add(user.getPhone());
! // System.out.println("phone:" +user.getPhone());
! u.add(user.getEmail());
! addRow( u );
!
!
! }
! }
!
!
! // try
! // {
! // liste = userRemote.getAll();
! //
! // }
! // catch(RemoteException e)
! // {
! // e.printStackTrace();
! // }
!
! // for(int i=0;i<liste.size();i++)
! // {
! // User obj = (User) liste.get(i);
! //
! // addRow(obj.getVector());
! // }
! }
! public int getColumnCount()
! {
! return header.length;
! }
! public String getColumnName(int col)
! {
! return header[col];
! }
! public boolean isCellEditable(int row, int col)
! {
! return false;
! }
!
! // private UserStatelessRemoteHome userRemoteHome;
! // private UserStatelessRemote userRemote;
! private String header[];
! private Object[] userArray;
!
!
!
!
}
--- 30,91 ----
public class UserModel extends DefaultTableModel
{
!
! public UserModel()
! {
! header = new String[]
! {
! ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("username"),
! ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("name"),
! ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("address"),
! ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("company"),
! ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("phone"),
! ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("email")
! };
!
! getData();
! }
!
! public void getData()
! {
! setRowCount(0);
!
! DataHolder.getInstance().refreshUser();
!
! userArray = DataHolder.getInstance().getUserList();
!
! for(int i=0;i<userArray.length;i++)
! {
! User user = (User)userArray[i];
!
! if( user != null )
! {
! Vector u = new Vector();
! u.add(user);
! u.add(user.getName());
! u.add(user.getAddress());
! u.add(user.getCompany());
! u.add(user.getPhone());
! u.add(user.getEmail());
! addRow( u );
! }
! }
! }
!
! public int getColumnCount()
! {
! return header.length;
! }
!
! public String getColumnName(int col)
! {
! return header[col];
! }
!
! public boolean isCellEditable(int row, int col)
! {
! return false;
! }
!
! private String header[];
! private Object[] userArray;
}
|
