Permalink
Browse files

Fixed insufficient header bug

  • Loading branch information...
1 parent 95de656 commit 35581b12071f691e6ea001965e165c879846f102 @gitahinganga gitahinganga committed May 1, 2012
View
3 adt_companion/Extract No. 1335772251082.csv
@@ -1,3 +0,0 @@
-"ArtID","Firstname","Surname","Sex","Pregnant","PatientTranNo","ArtID","DateofVisit","Drugname"
-"3","Henry","Otiende","Male","0","133866","3","2012-04-30 00:00:00","ABC60MG/3TC 30MG<PAED>"
-"1","John","Omondi","Male","0","133865","1","2012-04-30 00:00:00","3TC 10MG/ML"
View
4 adt_companion/Extract No. 1335772115699.csv → adt_companion/Extract No. 1335852456055.csv
@@ -1,4 +1,4 @@
"ArtID","Firstname","Surname","Sex","Pregnant","PatientTranNo","ArtID","DateofVisit","Drugname","PatientTranNo","ArtID","DateofVisit","Drugname"
+"1","John","Omondi","Male","0","133865","1","2012-04-30 00:00:00","3TC 10MG/ML","133862","1","2012-04-29 00:00:00","ABACAVIR (ABC) Liquid 20MG/ML (240ml)"
+"3","Henry","Otiende","Male","0","133866","3","2012-04-30 00:00:00","ABC60MG/3TC 30MG<PAED>"
"2","Alexia","Aloo","Female","0","133864","2","2012-04-29 00:00:00","ABC60MG/3TC 30MG<PAED>","133863","2","2012-04-29 00:00:00","ABC SYR"
-"1","John","Omondi","Male","0","133862","1","2012-04-29 00:00:00","ABACAVIR (ABC) Liquid 20MG/ML (240ml)"
-"3","Henry","Otiende","Male","0"
View
14 adt_companion/src/ke/go/moh/oec/adt/format/OneLineRecordFormat.java
@@ -44,7 +44,19 @@
for (LinkedRecord linkedRecord : linkedRecordList) {
recordList.addAll(extractRecordList(linkedRecord));
}
- List<String[]> stringArrayList = FormatHelper.convertToStringArrayList(recordList);
+ int recordSize = 0;
+ Record biggestRecord = null;
+ for (Record record : recordList) {
+ int rs = record.getOrdinaryCellMap().size();
+ if (rs > recordSize) {
+ recordSize = rs;
+ biggestRecord = record;
+ }
+ }
+ recordList.remove(biggestRecord);
+ List<Record> orderedRecordList = new ArrayList<Record>(recordList);
+ orderedRecordList.add(0, biggestRecord);
+ List<String[]> stringArrayList = FormatHelper.convertToStringArrayList(orderedRecordList);
return stringArrayList;
}
View
17 fingerprintmanager/nbproject/build-impl.xml
@@ -20,10 +20,10 @@ is divided into following sections:
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="fingerprintmanager-impl">
- <fail message="Please build using Ant 1.7.1 or higher.">
+ <fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
- <antversion atleast="1.7.1"/>
+ <antversion atleast="1.8.0"/>
</not>
</condition>
</fail>
@@ -198,6 +198,7 @@ is divided into following sections:
<property name="javac.fork" value="${jdkBug6558476}"/>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
+ <property name="copylibs.rebase" value="true"/>
<available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
</target>
<target name="-post-init">
@@ -384,6 +385,7 @@ is divided into following sections:
<property environment="env"/>
<resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
<java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg line="${profiler.info.jvmargs}"/>
<env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
@@ -514,7 +516,7 @@ is divided into following sections:
</chainedmapper>
</pathconvert>
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+ <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
<fileset dir="${build.classes.dir}"/>
<manifest>
<attribute name="Class-Path" value="${jar.classpath}"/>
@@ -839,6 +841,14 @@ is divided into following sections:
-->
<target depends="init" if="have.sources" name="-javadoc-build">
<mkdir dir="${dist.javadoc.dir}"/>
+ <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
+ <and>
+ <isset property="endorsed.classpath.cmd.line.arg"/>
+ <not>
+ <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
+ </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}">
<classpath>
<path path="${javac.classpath}"/>
@@ -850,6 +860,7 @@ is divided into following sections:
<include name="**/*.java"/>
<exclude name="*.java"/>
</fileset>
+ <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
<fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
View
4 fingerprintmanager/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.43.1.45
# 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=f183ef90
-nbproject/build-impl.xml.script.CRC32=7699730a
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
+nbproject/build-impl.xml.script.CRC32=5f065aa7
+nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.2.46
View
4 fingerprintmanager/nbproject/project.properties
@@ -1,9 +1,10 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=fingerprintmanager
+application.vendor=admin
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
@@ -24,6 +25,7 @@ debug.test.classpath=\
dist.dir=dist
dist.jar=${dist.dir}/fingerprintmanager.jar
dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
excludes=
includes=**
jar.compress=false
View
17 griaulefingerprintmanager/nbproject/build-impl.xml
@@ -20,10 +20,10 @@ is divided into following sections:
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="griaulefingerprintmanager-impl">
- <fail message="Please build using Ant 1.7.1 or higher.">
+ <fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
- <antversion atleast="1.7.1"/>
+ <antversion atleast="1.8.0"/>
</not>
</condition>
</fail>
@@ -198,6 +198,7 @@ is divided into following sections:
<property name="javac.fork" value="${jdkBug6558476}"/>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
+ <property name="copylibs.rebase" value="true"/>
<available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
</target>
<target name="-post-init">
@@ -384,6 +385,7 @@ is divided into following sections:
<property environment="env"/>
<resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
<java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg line="${profiler.info.jvmargs}"/>
<env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
@@ -514,7 +516,7 @@ is divided into following sections:
</chainedmapper>
</pathconvert>
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+ <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
<fileset dir="${build.classes.dir}"/>
<manifest>
<attribute name="Class-Path" value="${jar.classpath}"/>
@@ -846,6 +848,14 @@ is divided into following sections:
-->
<target depends="init" if="have.sources" name="-javadoc-build">
<mkdir dir="${dist.javadoc.dir}"/>
+ <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
+ <and>
+ <isset property="endorsed.classpath.cmd.line.arg"/>
+ <not>
+ <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
+ </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}">
<classpath>
<path path="${javac.classpath}"/>
@@ -857,6 +867,7 @@ is divided into following sections:
<include name="**/*.java"/>
<exclude name="*.java"/>
</fileset>
+ <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
<fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
View
4 griaulefingerprintmanager/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.43.1.45
# 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=85228441
-nbproject/build-impl.xml.script.CRC32=f56d1aad
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
+nbproject/build-impl.xml.script.CRC32=9dfb6c5a
+nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.2.46
View
1 griaulefingerprintmanager/nbproject/project.properties
@@ -1,5 +1,6 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=griaulefingerprintmanager
View
31 reception/nbproject/build-impl.xml
@@ -20,10 +20,10 @@ is divided into following sections:
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="reception-impl">
- <fail message="Please build using Ant 1.7.1 or higher.">
+ <fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
- <antversion atleast="1.7.1"/>
+ <antversion atleast="1.8.0"/>
</not>
</condition>
</fail>
@@ -198,6 +198,7 @@ is divided into following sections:
<property name="javac.fork" value="${jdkBug6558476}"/>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
+ <property name="copylibs.rebase" value="true"/>
<available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
</target>
<target name="-post-init">
@@ -384,6 +385,7 @@ is divided into following sections:
<property environment="env"/>
<resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
<java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg line="${profiler.info.jvmargs}"/>
<env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
@@ -514,7 +516,7 @@ is divided into following sections:
</chainedmapper>
</pathconvert>
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+ <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
<fileset dir="${build.classes.dir}"/>
<manifest>
<attribute name="Class-Path" value="${jar.classpath}"/>
@@ -590,13 +592,6 @@ is divided into following sections:
<param name="call.target" value="jar"/>
<param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
</antcall>
- <antcall target="-maybe-call-dep">
- <param name="call.built.properties" value="${built-jar.properties}"/>
- <param location="${project.oeclib}" name="call.subproject"/>
- <param location="${project.oeclib}/build.xml" name="call.script"/>
- <param name="call.target" value="jar"/>
- <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
- </antcall>
</target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
<target depends="init" name="-check-automatic-build">
@@ -860,6 +855,14 @@ is divided into following sections:
-->
<target depends="init" if="have.sources" name="-javadoc-build">
<mkdir dir="${dist.javadoc.dir}"/>
+ <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
+ <and>
+ <isset property="endorsed.classpath.cmd.line.arg"/>
+ <not>
+ <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
+ </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}">
<classpath>
<path path="${javac.classpath}"/>
@@ -871,6 +874,7 @@ is divided into following sections:
<include name="**/*.java"/>
<exclude name="*.java"/>
</fileset>
+ <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
<fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
@@ -1048,13 +1052,6 @@ is divided into following sections:
<param name="call.target" value="clean"/>
<param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
</antcall>
- <antcall target="-maybe-call-dep">
- <param name="call.built.properties" value="${built-clean.properties}"/>
- <param location="${project.oeclib}" name="call.subproject"/>
- <param location="${project.oeclib}/build.xml" name="call.script"/>
- <param name="call.target" value="clean"/>
- <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
- </antcall>
</target>
<target depends="init" name="-do-clean">
<delete dir="${build.dir}"/>
View
10 reception/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=030d4845
+build.xml.data.CRC32=f79620d4
build.xml.script.CRC32=df37f499
-build.xml.stylesheet.CRC32=28e38971@1.44.1.45
+build.xml.stylesheet.CRC32=28e38971@1.50.2.46
# 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=030d4845
-nbproject/build-impl.xml.script.CRC32=e7dcb468
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
+nbproject/build-impl.xml.data.CRC32=f79620d4
+nbproject/build-impl.xml.script.CRC32=5311d76e
+nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.2.46
View
7 reception/nbproject/project.properties
@@ -1,5 +1,6 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
annotation.processing.run.all.processors=true
application.desc=Electronic Clinic Reception System for Comprehensive Care Clinics
application.homepage=http://www.moh.go.ke/oec/reception
@@ -33,9 +34,9 @@ javac.classpath=\
${libs.JCalendar.classpath}:\
${libs.beans-binding.classpath}:\
${libs.Derby-JDBC-Driver.classpath}:\
- ${reference.oeclib.jar}:\
${reference.fingerprintmanager.jar}:\
- ${reference.griaulefingerprintmanager.jar}
+ ${reference.griaulefingerprintmanager.jar}:\
+ ${libs.OEC_Lib.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -65,10 +66,8 @@ mkdist.disabled=false
platform.active=default_platform
project.fingerprintmanager=../fingerprintmanager
project.griaulefingerprintmanager=../griaulefingerprintmanager
-project.oeclib=../../../../../projects/software/official/OpenEMRConnect/oeclib
reference.fingerprintmanager.jar=${project.fingerprintmanager}/dist/fingerprintmanager.jar
reference.griaulefingerprintmanager.jar=${project.griaulefingerprintmanager}/dist/griaulefingerprintmanager.jar
-reference.oeclib.jar=${project.oeclib}/dist/oeclib.jar
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
View
8 reception/nbproject/project.xml
@@ -29,14 +29,6 @@
<clean-target>clean</clean-target>
<id>jar</id>
</reference>
- <reference>
- <foreign-project>oeclib</foreign-project>
- <artifact-type>jar</artifact-type>
- <script>build.xml</script>
- <target>jar</target>
- <clean-target>clean</clean-target>
- <id>jar</id>
- </reference>
</references>
<swingapp xmlns="http://www.netbeans.org/ns/form-swingapp/1">
<application-class name="ke.go.moh.oec.reception.gui.App"/>
View
38 reception/src/ke/go/moh/oec/reception/gui/FingerprintDialog.java
@@ -39,7 +39,6 @@
import javax.swing.JOptionPane;
import ke.go.moh.oec.Fingerprint;
import ke.go.moh.oec.Fingerprint.TechnologyType;
-import ke.go.moh.oec.Fingerprint.Type;
import ke.go.moh.oec.fingerprintmanager.FingerprintManager;
import ke.go.moh.oec.fingerprintmanager.FingerprintManagerException;
import ke.go.moh.oec.fingerprintmanager.FingerprintingComponent;
@@ -372,17 +371,17 @@ public void dispose() {
public void addFingerprint() {
Fingerprint fingerPrint = new Fingerprint();
if (rightIndexRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.rightIndexFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.rightIndexFinger);
} else if (leftIndexRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.leftIndexFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.leftIndexFinger);
} else if (rightMiddleRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.rightMiddleFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.rightMiddleFinger);
} else if (leftMiddleRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.leftMiddleFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.leftMiddleFinger);
} else if (rightRingRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.rightRingFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.rightRingFinger);
} else if (leftRingRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.leftRingFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.leftRingFinger);
}
for (ImagedFingerprint imagedFingerprint : imagedFingerprintCache) {
if (imagedFingerprint.getFingerprint().getFingerprintType() == fingerPrint.getFingerprintType()) {
@@ -438,17 +437,17 @@ public boolean showConfirmMessage(String message, Component parent) {
private void cacheImagedFingerprint() {
Fingerprint fingerPrint = new Fingerprint();
if (rightIndexRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.rightIndexFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.rightIndexFinger);
} else if (leftIndexRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.leftIndexFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.leftIndexFinger);
} else if (rightMiddleRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.rightMiddleFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.rightMiddleFinger);
} else if (leftMiddleRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.leftMiddleFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.leftMiddleFinger);
} else if (rightRingRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.rightRingFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.rightRingFinger);
} else if (leftRingRadioButton.isSelected()) {
- fingerPrint.setFingerprintType(Type.leftRingFinger);
+ fingerPrint.setFingerprintType(Fingerprint.Type.leftRingFinger);
}
fingerPrint.setTechnologyType(TechnologyType.griauleTemplate);
ImagedFingerprint imagedFingerprint = new ImagedFingerprint(fingerPrint, fingerprintImagePanel.getImage(), qualityTextField.getText(), false);
@@ -473,7 +472,6 @@ private void cacheImagedFingerprint() {
} else {
showImage(oldImagedFingerprint.getImage(), true);
showQuality(oldImagedFingerprint.getQuality());
- return;
}
}
}
@@ -487,17 +485,17 @@ public void showTakenFingerprint() {
List<ImagedFingerprint> imagedFingerprintList = session.getImagedFingerprintList();
Fingerprint fingerprint = new Fingerprint();
if (rightIndexRadioButton.isSelected()) {
- fingerprint.setFingerprintType(Type.rightIndexFinger);
+ fingerprint.setFingerprintType(Fingerprint.Type.rightIndexFinger);
} else if (leftIndexRadioButton.isSelected()) {
- fingerprint.setFingerprintType(Type.leftIndexFinger);
+ fingerprint.setFingerprintType(Fingerprint.Type.leftIndexFinger);
} else if (rightMiddleRadioButton.isSelected()) {
- fingerprint.setFingerprintType(Type.rightMiddleFinger);
+ fingerprint.setFingerprintType(Fingerprint.Type.rightMiddleFinger);
} else if (leftMiddleRadioButton.isSelected()) {
- fingerprint.setFingerprintType(Type.leftMiddleFinger);
+ fingerprint.setFingerprintType(Fingerprint.Type.leftMiddleFinger);
} else if (rightRingRadioButton.isSelected()) {
- fingerprint.setFingerprintType(Type.rightRingFinger);
+ fingerprint.setFingerprintType(Fingerprint.Type.rightRingFinger);
} else if (leftRingRadioButton.isSelected()) {
- fingerprint.setFingerprintType(Type.leftRingFinger);
+ fingerprint.setFingerprintType(Fingerprint.Type.leftRingFinger);
}
ImagedFingerprint dummy = new ImagedFingerprint(fingerprint);
if (imagedFingerprintList.contains(dummy)) {

0 comments on commit 35581b1

Please sign in to comment.