Commit f1ae335f authored by Susanti Gojali's avatar Susanti Gojali
Browse files

konflik

parents 0fe6b4c4 f49f3594
src/server/nbproject/private/
src/server/build/
src/server/nbproject/private/private.properties
src/server/nbproject/private/private.xml
src/server/build/classes/
src/server/build/classes/tcpserver/
src/server/nbbuild/
src/server/dist/
src/server/nbdist/
src/server/nbactions.xml
src/server/nb-configuration.xml
src/client/nbproject/private/
src/client/nbproject/private/private.properties
src/client/nbproject/private/private.xml
src/client/build/
src/client/nbbuild/
src/client/dist/
src/client/nbdist/
src/client/nbactions.xml
src/client/nb-configuration.xml
......
#Fri, 17 Apr 2015 10:50:27 +0700
C\:\\Users\\Stephen\\Documents\\NetBeansProjects\\TubesSister\\src\\client=
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Properties>
<Property name="defaultCloseOperation" type="int" value="3"/>
<Property name="title" type="java.lang.String" value="Login/Register"/>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="cc" red="99" type="rgb"/>
</Property>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Default Cursor"/>
</Property>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="FISHfingers" size="10" style="0"/>
</Property>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="99" red="99" type="rgb"/>
</Property>
<Property name="locationByPlatform" type="boolean" value="true"/>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[400, 300]"/>
</Property>
<Property name="name" type="java.lang.String" value="loginFrame" noResource="true"/>
<Property name="resizable" type="boolean" value="false"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="70" pref="70" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="loginLabel" min="-2" max="-2" attributes="0"/>
<Component id="registerLabel" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="90" pref="90" max="-2" attributes="0"/>
<Component id="usernameLabel" min="-2" pref="70" max="-2" attributes="0"/>
<EmptySpace min="37" pref="37" max="-2" attributes="0"/>
<Component id="usernameTextField" min="-2" pref="128" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="90" pref="90" max="-2" attributes="0"/>
<Component id="passwordLabel" min="-2" pref="70" max="-2" attributes="0"/>
<EmptySpace min="37" pref="37" max="-2" attributes="0"/>
<Component id="passwordTextField" min="-2" pref="128" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="150" pref="150" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="registerButton" min="-2" pref="77" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<EmptySpace min="70" pref="70" max="-2" attributes="0"/>
<Component id="registernowLabel" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="80" pref="80" max="-2" attributes="0"/>
<Component id="loginButton" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="messageLabel" min="-2" pref="382" max="-2" attributes="0"/>
<EmptySpace pref="67" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="serverLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="serverTextField" min="-2" pref="135" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="backLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="45" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="serverLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="serverTextField" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="backLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="messageLabel" min="-2" pref="20" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="loginLabel" min="-2" max="-2" attributes="0"/>
<Component id="registerLabel" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="17" pref="17" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="6" pref="6" max="-2" attributes="0"/>
<Component id="usernameLabel" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="usernameTextField" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="18" pref="18" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="8" pref="8" max="-2" attributes="0"/>
<Component id="passwordLabel" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="passwordTextField" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="16" pref="16" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="registerButton" min="-2" max="-2" attributes="0"/>
<Component id="registernowLabel" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<EmptySpace min="20" pref="20" max="-2" attributes="0"/>
<Component id="loginButton" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="loginLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="14" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="LOGIN"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="registerLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="14" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="REGISTER"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="usernameLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Username"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="passwordLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Password"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="usernameTextField">
</Component>
<Component class="javax.swing.JTextField" name="passwordTextField">
</Component>
<Component class="javax.swing.JLabel" name="registernowLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Register Now!"/>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="registernowLabelMouseClicked"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="loginButton">
<Properties>
<Property name="text" type="java.lang.String" value="Login"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="loginButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="registerButton">
<Properties>
<Property name="text" type="java.lang.String" value="Register"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="registerButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="messageLabel">
</Component>
<Component class="javax.swing.JTextField" name="serverTextField">
<Properties>
<Property name="text" type="java.lang.String" value="localhost"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="serverLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Server:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="backLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Back"/>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="backLabelMouseClicked"/>
</Events>
</Component>
</SubComponents>
</Form>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment