Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java

src/netz/view/ChatView.form

+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.3" 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="ChatTool"/>
+  </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"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
+  </AuxValues>
+
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+  <SubComponents>
+    <Container class="javax.swing.JPanel" name="jPanel1">
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="First"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
+        <Property name="columns" type="int" value="0"/>
+        <Property name="rows" type="int" value="1"/>
+      </Layout>
+      <SubComponents>
+        <Component class="javax.swing.JLabel" name="lblType">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Client"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="btnSetClient">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Client"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="btnSetServer">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Server"/>
+          </Properties>
+        </Component>
+      </SubComponents>
+    </Container>
+    <Component class="javax.swing.JTextField" name="txtField">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="jTextField1"/>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
+    </Component>
+    <Component class="javax.swing.JButton" name="btnSend">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Send"/>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="After"/>
+        </Constraint>
+      </Constraints>
+    </Component>
+    <Component class="javax.swing.JLabel" name="lblStatusDialog">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="&quot;&quot;"/>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Last"/>
+        </Constraint>
+      </Constraints>
+    </Component>
+  </SubComponents>
+</Form>

src/netz/view/ChatView.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package netz.view;
+
+/**
+ *
+ * @author hd
+ */
+public class ChatView extends javax.swing.JFrame
+{
+
+  /**
+   * @return the btnSend
+   */
+  public javax.swing.JButton getBtnSend()
+  {
+    return btnSend;
+  }
+
+  /**
+   * @return the btnSetClient
+   */
+  public javax.swing.JButton getBtnSetClient()
+  {
+    return btnSetClient;
+  }
+
+  /**
+   * @return the btnSetServer
+   */
+  public javax.swing.JButton getBtnSetServer()
+  {
+    return btnSetServer;
+  }
+
+  /**
+   * @return the lblStatusDialog
+   */
+  public javax.swing.JLabel getLblStatusDialog()
+  {
+    return lblStatusDialog;
+  }
+
+  /**
+   * @param lblStatusDialog the lblStatusDialog to set
+   */
+  public void setLblStatusDialog(javax.swing.JLabel lblStatusDialog)
+  {
+    this.lblStatusDialog = lblStatusDialog;
+  }
+
+  /**
+   * @return the lblType
+   */
+  public javax.swing.JLabel getLblType()
+  {
+    return lblType;
+  }
+
+  /**
+   * @param lblType the lblType to set
+   */
+  public void setLblType(javax.swing.JLabel lblType)
+  {
+    this.lblType = lblType;
+  }
+
+  /**
+   * @return the txtField
+   */
+  public javax.swing.JTextField getTxtField()
+  {
+    return txtField;
+  }
+
+  /**
+   * @param txtField the txtField to set
+   */
+  public void setTxtField(javax.swing.JTextField txtField)
+  {
+    this.txtField = txtField;
+  }
+
+  /**
+   * Creates new form chatView
+   */
+  public ChatView()
+  {
+    initComponents();
+  }
+
+  /**
+   * This method is called from within the constructor to initialize the form.
+   * WARNING: Do NOT modify this code. The content of this method is always
+   * regenerated by the Form Editor.
+   */
+  @SuppressWarnings("unchecked")
+  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  private void initComponents()
+  {
+
+    jPanel1 = new javax.swing.JPanel();
+    lblType = new javax.swing.JLabel();
+    btnSetClient = new javax.swing.JButton();
+    btnSetServer = new javax.swing.JButton();
+    txtField = new javax.swing.JTextField();
+    btnSend = new javax.swing.JButton();
+    lblStatusDialog = new javax.swing.JLabel();
+
+    setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+    setTitle("ChatTool");
+
+    jPanel1.setLayout(new java.awt.GridLayout());
+
+    lblType.setText("Client");
+    jPanel1.add(lblType);
+
+    btnSetClient.setText("Client");
+    jPanel1.add(btnSetClient);
+
+    btnSetServer.setText("Server");
+    jPanel1.add(btnSetServer);
+
+    getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_START);
+
+    txtField.setText("jTextField1");
+    getContentPane().add(txtField, java.awt.BorderLayout.CENTER);
+
+    btnSend.setText("Send");
+    getContentPane().add(btnSend, java.awt.BorderLayout.LINE_END);
+
+    lblStatusDialog.setText("\"\"");
+    getContentPane().add(lblStatusDialog, java.awt.BorderLayout.PAGE_END);
+
+    pack();
+  }// </editor-fold>//GEN-END:initComponents
+
+  /**
+   * @param args the command line arguments
+   */
+  public static void main(String args[])
+  {
+    /* Set the Nimbus look and feel */
+    //<editor-fold defaultstate="collapsed" desc=" Look and feel setting code (optional) ">
+    /* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel.
+         * For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html 
+     */
+    try
+    {
+      for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels())
+      {
+        if ("Nimbus".equals(info.getName()))
+        {
+          javax.swing.UIManager.setLookAndFeel(info.getClassName());
+          break;
+        }
+      }
+    }
+    catch (ClassNotFoundException ex)
+    {
+      java.util.logging.Logger.getLogger(ChatView.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+    }
+    catch (InstantiationException ex)
+    {
+      java.util.logging.Logger.getLogger(ChatView.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+    }
+    catch (IllegalAccessException ex)
+    {
+      java.util.logging.Logger.getLogger(ChatView.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+    }
+    catch (javax.swing.UnsupportedLookAndFeelException ex)
+    {
+      java.util.logging.Logger.getLogger(ChatView.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+    }
+    //</editor-fold>
+    //</editor-fold>
+
+    /* Create and display the form */
+    java.awt.EventQueue.invokeLater(new Runnable()
+    {
+      public void run()
+      {
+        new ChatView().setVisible(true);
+      }
+    });
+  }
+
+  // Variables declaration - do not modify//GEN-BEGIN:variables
+  private javax.swing.JButton btnSend;
+  private javax.swing.JButton btnSetClient;
+  private javax.swing.JButton btnSetServer;
+  private javax.swing.JPanel jPanel1;
+  private javax.swing.JLabel lblStatusDialog;
+  private javax.swing.JLabel lblType;
+  private javax.swing.JTextField txtField;
+  // End of variables declaration//GEN-END:variables
+}