V.2

shengnuo · Jun 4, 2015 · 5862ceb · 5862ceb
1 parent e2c95f0
commit 5862ceb
Show file tree

Hide file tree

Showing 22 changed files with 149 additions and 232 deletions.
diff --git a/build/classes/employeedatabase/Main$1.class b/build/classes/employeedatabase/Main$1.class
diff --git a/build/classes/employeedatabase/Main$10.class b/build/classes/employeedatabase/Main$10.class
diff --git a/build/classes/employeedatabase/Main$11.class b/build/classes/employeedatabase/Main$11.class
diff --git a/build/classes/employeedatabase/Main$12.class b/build/classes/employeedatabase/Main$12.class
diff --git a/build/classes/employeedatabase/Main$13.class b/build/classes/employeedatabase/Main$13.class
diff --git a/build/classes/employeedatabase/Main$2.class b/build/classes/employeedatabase/Main$2.class
diff --git a/build/classes/employeedatabase/Main$3.class b/build/classes/employeedatabase/Main$3.class
diff --git a/build/classes/employeedatabase/Main$4.class b/build/classes/employeedatabase/Main$4.class
diff --git a/build/classes/employeedatabase/Main$5.class b/build/classes/employeedatabase/Main$5.class
diff --git a/build/classes/employeedatabase/Main$6.class b/build/classes/employeedatabase/Main$6.class
diff --git a/build/classes/employeedatabase/Main$7.class b/build/classes/employeedatabase/Main$7.class
diff --git a/build/classes/employeedatabase/Main$8.class b/build/classes/employeedatabase/Main$8.class
diff --git a/build/classes/employeedatabase/Main$9.class b/build/classes/employeedatabase/Main$9.class
diff --git a/build/classes/employeedatabase/Main.class b/build/classes/employeedatabase/Main.class
diff --git a/build/classes/employeedatabase/Main.form b/build/classes/employeedatabase/Main.form
@@ -34,7 +34,11 @@
           <Group type="102" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <Component id="jToolBar1" min="-2" pref="100" max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                  <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
                               <EmptySpace min="-2" pref="66" max="-2" attributes="0"/>
@@ -53,7 +57,7 @@
                                                   <Group type="102" alignment="0" attributes="0">
                                                       <Component id="jLabel11" min="-2" max="-2" attributes="0"/>
                                                       <EmptySpace max="-2" attributes="0"/>
-                                                      <Component id="departmentTField1" pref="223" max="32767" attributes="0"/>
+                                                      <Component id="departmentTField1" pref="233" max="32767" attributes="0"/>
                                                   </Group>
                                                   <Group type="102" alignment="0" attributes="0">
                                                       <EmptySpace min="-2" pref="19" max="-2" attributes="0"/>
@@ -96,49 +100,40 @@
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                           </Group>
-                      </Group>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="searchButton" alignment="1" min="-2" max="-2" attributes="0"/>
-                          <Component id="jScrollPane1" alignment="1" min="-2" pref="129" max="-2" attributes="0"/>
-                          <Component id="deleteButton" alignment="1" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <Group type="103" groupAlignment="1" attributes="0">
-                                  <Component id="lasNameLabel1" alignment="1" min="-2" max="-2" attributes="0"/>
-                                  <Component id="firstNameLabel1" alignment="1" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="1" attributes="0">
-                                  <Component id="firstNameTField1" alignment="0" min="-2" pref="136" max="-2" attributes="0"/>
-                                  <Component id="lastNameTField1" alignment="1" min="-2" pref="136" max="-2" attributes="0"/>
-                              </Group>
-                              <EmptySpace max="32767" attributes="0"/>
-                              <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                                  <Component id="empNoSearchLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="employeeSearchTField" min="-2" pref="158" max="-2" attributes="0"/>
-                              </Group>
-                          </Group>
                           <Group type="102" alignment="0" attributes="0">
-                              <Group type="103" groupAlignment="1" attributes="0">
-                                  <Component id="phoneLabel1" alignment="1" min="-2" max="-2" attributes="0"/>
-                                  <Component id="emailLabel1" alignment="1" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                              <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="1" max="-2" attributes="0">
-                                  <Component id="emailTField1" alignment="0" max="32767" attributes="0"/>
-                                  <Component id="phoneTField1" alignment="0" min="-2" pref="225" max="-2" attributes="0"/>
+                              <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Group type="102" alignment="0" attributes="0">
+                                      <Group type="103" groupAlignment="1" attributes="0">
+                                          <Component id="lasNameLabel1" alignment="1" min="-2" max="-2" attributes="0"/>
+                                          <Component id="firstNameLabel1" alignment="1" min="-2" max="-2" attributes="0"/>
+                                      </Group>
+                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                                      <Group type="103" groupAlignment="1" attributes="0">
+                                          <Component id="firstNameTField1" alignment="0" min="-2" pref="136" max="-2" attributes="0"/>
+                                          <Component id="lastNameTField1" alignment="1" min="-2" pref="136" max="-2" attributes="0"/>
+                                      </Group>
+                                  </Group>
+                                  <Group type="102" alignment="0" attributes="0">
+                                      <Group type="103" groupAlignment="1" attributes="0">
+                                          <Component id="phoneLabel1" alignment="1" min="-2" max="-2" attributes="0"/>
+                                          <Component id="emailLabel1" alignment="1" min="-2" max="-2" attributes="0"/>
+                                      </Group>
+                                      <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
+                                      <Group type="103" groupAlignment="1" max="-2" attributes="0">
+                                          <Component id="emailTField1" alignment="0" max="32767" attributes="0"/>
+                                          <Component id="phoneTField1" alignment="0" min="-2" pref="225" max="-2" attributes="0"/>
+                                      </Group>
+                                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                                  </Group>
                               </Group>
-                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                              <EmptySpace min="-2" pref="53" max="-2" attributes="0"/>
                           </Group>
                       </Group>
-                  </Group>
-                  <Group type="102" attributes="0">
-                      <Component id="jToolBar1" min="-2" pref="100" max="-2" attributes="0"/>
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                      <Group type="103" groupAlignment="1" attributes="0">
+                          <Component id="deleteButton" min="-2" max="-2" attributes="0"/>
+                          <Component id="jScrollPane1" min="-2" pref="129" max="-2" attributes="0"/>
+                      </Group>
                   </Group>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
@@ -150,9 +145,8 @@
           <Group type="102" alignment="1" attributes="0">
               <Component id="jToolBar1" min="-2" pref="25" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="1" attributes="0">
-                  <Component id="empNoSearchLabel" min="-2" max="-2" attributes="0"/>
-                  <Group type="102" alignment="1" attributes="0">
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="firstNameTField1" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
                           <Component id="firstNameLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -162,16 +156,11 @@
                           <Component id="lasNameLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="lastNameTField1" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
                       </Group>
-                  </Group>
-              </Group>
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="phoneLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="phoneTField1" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
-                  <Component id="employeeSearchTField" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="3" attributes="0">
+                          <Component id="phoneLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="phoneTField1" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
+                      </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="emailLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -219,11 +208,8 @@
                           <Component id="saveButton" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
                   </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
-                      <Component id="searchButton" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jScrollPane1" min="-2" pref="248" max="-2" attributes="0"/>
+                  <Group type="102" attributes="0">
+                      <Component id="jScrollPane1" min="-2" pref="365" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="deleteButton" min="-2" max="-2" attributes="0"/>
                   </Group>
@@ -375,21 +361,6 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="saveButtonActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JLabel" name="empNoSearchLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="Employee Number:"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JTextField" name="employeeSearchTField">
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="employeeSearchTFieldActionPerformed"/>
-      </Events>
-    </Component>
-    <Component class="javax.swing.JButton" name="searchButton">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="Search"/>
-      </Properties>
-    </Component>
     <Container class="javax.swing.JScrollPane" name="jScrollPane1">
       <AuxValues>
         <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>

diff --git a/database.txt b/database.txt
@@ -1,8 +1,10 @@
-a b 93843 c d e f f 0.2 555565.0 
+fefafe feafa 18192 hkhk hjl jl jl f 0.1 4546.0 
 
-feafeafeafeafea feafa 79557 gjhk hjkjh hjkhk hkkjjk f 0.5 55.0 
+occc akb 8432 fafea null null null p 0.005 0.0 0 0 
 
-fefafe feafa 18192 hkhk hjl jl jl f 0.1 4546.0 
+a b 93843 c d e f f 0.2 555565.0 
+
+peter john 43587 123 [email protected] fea fea f 5.0 5.0 
 
-occ akb 8432 fafea null null null p 0.5 0.0 0 0 
+feafeafeafeafea feafa 79557 gjhk hjkjh hjkhk hkkjjk f 0.5 55.0 
 
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
@@ -80,9 +80,12 @@ is divided into following sections:
             </and>
         </condition>
         <condition property="do.archive">
-            <not>
-                <istrue value="${jar.archive.disabled}"/>
-            </not>
+            <or>
+                <not>
+                    <istrue value="${jar.archive.disabled}"/>
+                </not>
+                <istrue value="${not.archive.disabled}"/>
+            </or>
         </condition>
         <condition property="do.mkdist">
             <and>
@@ -899,6 +902,7 @@ is divided into following sections:
             <param location="${project.EmployeesDatabase}/build.xml" name="call.script"/>
             <param name="call.target" value="jar"/>
             <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
         </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
@@ -1206,11 +1210,14 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <condition else="" property="bug5101868workaround" value="*.java">
+            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+        </condition>
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
@@ -1284,7 +1291,7 @@ is divided into following sections:
         <mkdir dir="${build.test.results.dir}"/>
     </target>
     <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test testincludes="**/*Test.java"/>
+        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
@@ -1388,6 +1395,7 @@ is divided into following sections:
             <param location="${project.EmployeesDatabase}/build.xml" name="call.script"/>
             <param name="call.target" value="clean"/>
             <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
         </antcall>
     </target>
     <target depends="init" name="-do-clean">

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ [email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=f7f57f11
-nbproject/build-impl.xml.script.CRC32=77aff9c0
-nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
+nbproject/build-impl.xml.script.CRC32=fd6ba015
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
@@ -1,3 +1,3 @@
 compile.on.save=true
 project.EmployeesDatabase=C:\\Users\\Shengnuo\\Documents\\NetBeansProjects\\EmployeeDataBase
-user.properties.file=C:\\Users\\Shengnuo\\AppData\\Roaming\\NetBeans\\7.4\\build.properties
+user.properties.file=C:\\Users\\Shengnuo\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -3,11 +3,7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/slin/Documents/EmployeeDataBase/src/employeedatabase/Employee.java</file>
-            <file>file:/home/slin/Documents/EmployeeDataBase/src/employeedatabase/Main.java</file>
-            <file>file:/home/slin/Documents/EmployeeDataBase/src/employeedatabase/FullTimeEmployee.java</file>
-            <file>file:/home/slin/Documents/EmployeeDataBase/src/employeedatabase/HashTable.java</file>
-            <file>file:/home/slin/Documents/EmployeeDataBase/src/employeedatabase/PartTimeEmployee.java</file>
+            <file>file:/C:/Users/Shengnuo/Documents/EmployeeDataBase/src/employeedatabase/Main.java</file>
         </group>
     </open-files>
 </project-private>