Menu
▾
▴
[Openbroad-commits] openbroad/src/org/openbroad/client/admin/view CreateUser.form,1.1.1.1,1.2 CreateUser.java,1.1.1.1,1.2
|
From: Frank B. J. <bi...@us...> - 2004-05-05 08:02:15
|
Update of /cvsroot/openbroad/openbroad/src/org/openbroad/client/admin/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10462 Modified Files: CreateUser.form CreateUser.java Log Message: Added support for userroles. Index: CreateUser.form =================================================================== RCS file: /cvsroot/openbroad/openbroad/src/org/openbroad/client/admin/view/CreateUser.form,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CreateUser.form 15 Apr 2004 12:36:16 -0000 1.1.1.1 --- CreateUser.form 5 May 2004 08:02:06 -0000 1.2 *************** *** 14,18 **** </SyntheticProperties> <Events> ! <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/> </Events> <AuxValues> --- 14,18 ---- </SyntheticProperties> <Events> ! <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosing"/> </Events> <AuxValues> *************** *** 39,43 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 39,43 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 51,55 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 51,55 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 63,67 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 63,67 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 75,79 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 75,79 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 87,91 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 87,91 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 99,103 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 99,103 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 111,115 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 111,115 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 123,127 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 123,127 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 135,139 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 135,139 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 147,151 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="9" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 147,151 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="9" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 159,163 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 159,163 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 171,175 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 171,175 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 183,187 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="12" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 183,187 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="12" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 201,207 **** <Property name="columns" type="int" value="15"/> </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="passwordActionPerformed"/> - </Events> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> --- 201,204 ---- *************** *** 224,230 **** <Property name="columns" type="int" value="15"/> </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="companyActionPerformed"/> - </Events> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> --- 221,224 ---- *************** *** 323,326 **** --- 317,347 ---- </Constraints> </Component> + <Component class="javax.swing.JLabel" name="jLabel14"> + <Properties> + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/openbroad/client/languages/openbroad.properties" key="role" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> + <GridBagConstraints gridX="0" gridY="13" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="13" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="role"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="2"> + <StringItem index="0" value="User"/> + <StringItem index="1" value="Admin"/> + </StringArray> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> + <GridBagConstraints gridX="1" gridY="13" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="3" insetsBottom="3" insetsRight="3" anchor="17" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> </SubComponents> </Container> *************** *** 336,340 **** </Layout> <SubComponents> ! <Component class="javax.swing.JButton" name="jButton2"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.openide.explorer.propertysheet.editors.IconEditor"> --- 357,361 ---- </Layout> <SubComponents> ! <Component class="javax.swing.JButton" name="close"> <Properties> <Property name="icon" type="javax.swing.Icon" editor="org.openide.explorer.propertysheet.editors.IconEditor"> *************** *** 346,350 **** </Properties> <Events> ! <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelActionPerformed"/> </Events> </Component> --- 367,371 ---- </Properties> <Events> ! <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="closeActionPerformed"/> </Events> </Component> Index: CreateUser.java =================================================================== RCS file: /cvsroot/openbroad/openbroad/src/org/openbroad/client/admin/view/CreateUser.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CreateUser.java 15 Apr 2004 12:36:17 -0000 1.1.1.1 --- CreateUser.java 5 May 2004 08:02:06 -0000 1.2 *************** *** 17,41 **** package org.openbroad.client.admin.view; ! ! import org.openbroad.shared.User; ! import org.openbroad.client.admin.view.control.UserLogic; ! import org.openbroad.client.stub.*; ! import org.openbroad.client.user.view.control.Config; ! import java.net.URL; import java.net.MalformedURLException; import java.rmi.RemoteException; ! import javax.xml.rpc.ServiceException; import javax.swing.JOptionPane; ! import org.openbroad.client.admin.view.model.*; /** * - * @author rais */ ! public class CreateUser extends javax.swing.JDialog { /** Creates new form createUser */ ! public CreateUser(java.awt.Frame parent,UserModel model) { super(parent, true); --- 17,42 ---- package org.openbroad.client.admin.view; ! import java.awt.Frame; import java.net.MalformedURLException; + import java.net.URL; import java.rmi.RemoteException; ! import javax.swing.JDialog; import javax.swing.JOptionPane; ! import javax.xml.rpc.ServiceException; ! import org.openbroad.client.admin.view.control.Config; ! import org.openbroad.client.admin.view.control.UserLogic; ! import org.openbroad.client.admin.view.model.UserModel; ! import org.openbroad.client.stub.User; ! import org.openbroad.client.stub.UserServiceRemoteServiceLocator; ! import org.openbroad.client.stub.UserServiceSoapBindingStub; /** * */ ! public class CreateUser extends JDialog { /** Creates new form createUser */ ! public CreateUser(Frame parent, UserModel model) { super(parent, true); *************** *** 43,48 **** this.model=model; - - setVisible(true); } --- 44,47 ---- *************** *** 84,89 **** email = new javax.swing.JTextField(); url = new javax.swing.JTextField(); jPanel2 = new javax.swing.JPanel(); ! jButton2 = new javax.swing.JButton(); save = new javax.swing.JButton(); --- 83,90 ---- email = new javax.swing.JTextField(); url = new javax.swing.JTextField(); + jLabel14 = new javax.swing.JLabel(); + role = new javax.swing.JComboBox(); jPanel2 = new javax.swing.JPanel(); ! close = new javax.swing.JButton(); save = new javax.swing.JButton(); *************** *** 93,97 **** public void windowClosing(java.awt.event.WindowEvent evt) { ! closeDialog(evt); } }); --- 94,98 ---- public void windowClosing(java.awt.event.WindowEvent evt) { ! formWindowClosing(evt); } }); *************** *** 101,105 **** jLabel1.setText(java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("username")); gridBagConstraints = new java.awt.GridBagConstraints(); ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel1, gridBagConstraints); --- 102,106 ---- jLabel1.setText(java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("username")); gridBagConstraints = new java.awt.GridBagConstraints(); ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel1, gridBagConstraints); *************** *** 109,113 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel2, gridBagConstraints); --- 110,114 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel2, gridBagConstraints); *************** *** 117,121 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel3, gridBagConstraints); --- 118,122 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel3, gridBagConstraints); *************** *** 125,129 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 3; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel4, gridBagConstraints); --- 126,130 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 3; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel4, gridBagConstraints); *************** *** 133,137 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 4; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel5, gridBagConstraints); --- 134,138 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 4; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel5, gridBagConstraints); *************** *** 141,145 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 5; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel6, gridBagConstraints); --- 142,146 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 5; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel6, gridBagConstraints); *************** *** 149,153 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 6; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel7, gridBagConstraints); --- 150,154 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 6; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel7, gridBagConstraints); *************** *** 157,161 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 7; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel8, gridBagConstraints); --- 158,162 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 7; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel8, gridBagConstraints); *************** *** 165,169 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 8; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel9, gridBagConstraints); --- 166,170 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 8; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel9, gridBagConstraints); *************** *** 173,177 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 9; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel10, gridBagConstraints); --- 174,178 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 9; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel10, gridBagConstraints); *************** *** 181,185 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 10; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel11, gridBagConstraints); --- 182,186 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 10; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel11, gridBagConstraints); *************** *** 189,193 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 11; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel12, gridBagConstraints); --- 190,194 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 11; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel12, gridBagConstraints); *************** *** 197,201 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 12; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel13, gridBagConstraints); --- 198,202 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 12; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); jPanel1.add(jLabel13, gridBagConstraints); *************** *** 208,219 **** password.setColumns(15); - password.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - passwordActionPerformed(evt); - } - }); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; --- 209,212 ---- *************** *** 232,243 **** company.setColumns(15); - company.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - companyActionPerformed(evt); - } - }); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; --- 225,228 ---- *************** *** 319,337 **** jPanel1.add(url, gridBagConstraints); getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER); jPanel2.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT)); ! jButton2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openbroad/client/ressources/icons16/stock_close-16.png"))); ! jButton2.setText(java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("close")); ! jButton2.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { ! cancelActionPerformed(evt); } }); ! jPanel2.add(jButton2); save.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openbroad/client/ressources/icons16/stock_save-16.png"))); --- 304,338 ---- jPanel1.add(url, gridBagConstraints); + jLabel14.setText(java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("role")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 13; + gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; + gridBagConstraints.insets = new java.awt.Insets(9, 3, 3, 3); + jPanel1.add(jLabel14, gridBagConstraints); + + role.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "User", "Admin" })); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 13; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(9, 3, 3, 3); + jPanel1.add(role, gridBagConstraints); + getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER); jPanel2.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT)); ! close.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openbroad/client/ressources/icons16/stock_close-16.png"))); ! close.setText(java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("close")); ! close.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { ! closeActionPerformed(evt); } }); ! jPanel2.add(close); save.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/openbroad/client/ressources/icons16/stock_save-16.png"))); *************** *** 352,442 **** setBounds((screenSize.width-376)/2, (screenSize.height-446)/2, 376, 446); }//GEN-END:initComponents ! ! private void cancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelActionPerformed ! setVisible(false); ! dispose(); ! }//GEN-LAST:event_cancelActionPerformed ! ! private void saveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveActionPerformed ! org.openbroad.client.stub.User user = new org.openbroad.client.stub.User(); ! user.setUsername(username.getText()); ! user.setPassword(password.getText()); ! user.setName(name.getText()); ! user.setAddress(address.getText()); ! user.setCity(city.getText()); ! user.setZip(zip.getText()); ! user.setState(state.getText()); ! user.setCountry(country.getText()); ! user.setPhone(phone.getText()); ! user.setCompany(company.getText()); ! user.setFax(fax.getText()); ! user.setEmail(email.getText()); ! user.setUrl(url.getText()); ! ! if(UserLogic.create(user)) ! { ! try ! { ! URL url = new URL("http://"+Config.getConfig().getProperty("server")+":8080/jboss-net/services/UserService"); ! UserServiceRemoteServiceLocator userloc = new UserServiceRemoteServiceLocator(); ! UserServiceSoapBindingStub usrstub = (UserServiceSoapBindingStub) userloc.getUserService(url); ! ! usrstub.setUsername( Config.getConfig().getProperty("username") ); ! usrstub.setPassword( Config.getConfig().getProperty("password") ); ! ! usrstub.createUser(user); ! model.getData(); ! dispose(); ! } ! catch( MalformedURLException murle ) ! { ! murle.printStackTrace(); ! } ! catch( ServiceException e ) ! { ! e.printStackTrace(); ! } ! catch( ClassCastException e ) ! { ! e.printStackTrace(); ! } ! catch( RemoteException e ) ! { ! e.printStackTrace(); ! } ! ! } ! else ! { ! JOptionPane.showMessageDialog(this,"Du skal udfylder alle felter!"); ! ! } ! }//GEN-LAST:event_saveActionPerformed ! ! private void companyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_companyActionPerformed ! // TODO add your handling code here: ! }//GEN-LAST:event_companyActionPerformed ! ! private void passwordActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_passwordActionPerformed ! // TODO add your handling code here: ! }//GEN-LAST:event_passwordActionPerformed ! ! /** Closes the dialog */ ! private void closeDialog(java.awt.event.WindowEvent evt)//GEN-FIRST:event_closeDialog ! { ! setVisible(false); ! dispose(); ! }//GEN-LAST:event_closeDialog ! ! private UserModel model=null; ! // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JTextField address; private javax.swing.JTextField city; private javax.swing.JTextField company; private javax.swing.JTextField country; private javax.swing.JTextField email; private javax.swing.JTextField fax; - private javax.swing.JButton jButton2; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel10; --- 353,441 ---- setBounds((screenSize.width-376)/2, (screenSize.height-446)/2, 376, 446); }//GEN-END:initComponents ! ! private void formWindowClosing(java.awt.event.WindowEvent evt)//GEN-FIRST:event_formWindowClosing ! {//GEN-HEADEREND:event_formWindowClosing ! setVisible(false); ! dispose(); ! }//GEN-LAST:event_formWindowClosing ! ! private void closeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_closeActionPerformed ! {//GEN-HEADEREND:event_closeActionPerformed ! setVisible(false); ! dispose(); ! }//GEN-LAST:event_closeActionPerformed ! ! private void saveActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_saveActionPerformed ! {//GEN-HEADEREND:event_saveActionPerformed ! User user = new User(); ! user.setUsername(username.getText()); ! user.setPassword(password.getText()); ! user.setName(name.getText()); ! user.setAddress(address.getText()); ! user.setCity(city.getText()); ! user.setZip(zip.getText()); ! user.setState(state.getText()); ! user.setCountry(country.getText()); ! user.setPhone(phone.getText()); ! user.setCompany(company.getText()); ! user.setFax(fax.getText()); ! user.setEmail(email.getText()); ! user.setUrl(url.getText()); ! ! Object[] rolea = new Object[1]; ! ! rolea[0] = ((String)role.getSelectedItem()).toLowerCase(); ! ! user.setRoles(rolea); ! ! if(UserLogic.create(user)) ! { ! try ! { ! URL url = new URL("http://"+Config.getConfig().getProperty("server")+":8080/jboss-net/services/UserService"); ! UserServiceRemoteServiceLocator userloc = new UserServiceRemoteServiceLocator(); ! UserServiceSoapBindingStub usrstub = (UserServiceSoapBindingStub) userloc.getUserService(url); ! ! usrstub.setUsername( Config.getConfig().getProperty("username") ); ! usrstub.setPassword( Config.getConfig().getProperty("password") ); ! ! usrstub.createUser(user); ! model.getData(); ! dispose(); ! } ! catch( MalformedURLException murle ) ! { ! murle.printStackTrace(); ! } ! catch( ServiceException e ) ! { ! e.printStackTrace(); ! } ! catch( ClassCastException e ) ! { ! e.printStackTrace(); ! } ! catch( RemoteException e ) ! { ! e.printStackTrace(); ! } ! ! } ! else ! { ! JOptionPane.showMessageDialog(this,"Du skal udfylder alle felter!"); ! } ! }//GEN-LAST:event_saveActionPerformed ! ! private UserModel model=null; ! // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JTextField address; private javax.swing.JTextField city; + private javax.swing.JButton close; private javax.swing.JTextField company; private javax.swing.JTextField country; private javax.swing.JTextField email; private javax.swing.JTextField fax; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel10; *************** *** 444,447 **** --- 443,447 ---- private javax.swing.JLabel jLabel12; private javax.swing.JLabel jLabel13; + private javax.swing.JLabel jLabel14; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; *************** *** 457,460 **** --- 457,461 ---- private javax.swing.JTextField password; private javax.swing.JTextField phone; + private javax.swing.JComboBox role; private javax.swing.JTextField state; private javax.swing.JTextField url; *************** *** 462,465 **** private javax.swing.JTextField zip; // End of variables declaration//GEN-END:variables - } --- 463,465 ---- |
