NumberFormatedTextField ahora calcula la operacion matematica ingresada en su campo

This commit is contained in:
Daniel Cortes
2019-01-06 12:36:44 -03:00
parent 573df8fc03
commit b8d66f0472
6 changed files with 113 additions and 198 deletions

262
.idea/workspace.xml generated
View File

@@ -12,11 +12,11 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment=""> <list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/caja.iml" beforeDir="false" afterPath="$PROJECT_DIR$/caja.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/caja.jar" beforeDir="false" afterPath="$PROJECT_DIR$/dist/caja.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/dist/caja.jar" beforeDir="false" afterPath="$PROJECT_DIR$/dist/caja.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/dist/database.sqlite" afterDir="false" /> <change beforePath="$PROJECT_DIR$/dist/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/dist/database.sqlite" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" /> <ignored path=".idea/" />
@@ -72,81 +72,25 @@
<favorites_list name="caja" /> <favorites_list name="caja" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="207">
<caret line="399" column="37" selection-start-line="399" selection-start-column="37" selection-end-line="399" selection-end-column="37" /> <caret line="89" column="27" selection-start-line="89" selection-start-column="27" selection-end-line="89" selection-end-column="27" />
<folding> <folding>
<element signature="docComment;class#EgresosController#0" /> <element signature="imports" expanded="true" />
<element signature="docComment;method#EgresosController#0;class#EgresosController#0" /> <element signature="docComment;class#NumberFormatedTextField#0" />
<element signature="method#EgresosController#0;class#EgresosController#0" /> <element signature="docComment;method#NumberFormatedTextField#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#getEgresoDAO#0;class#EgresosController#0" /> <element signature="docComment;method#setValue#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#getTipoEgresoDAO#0;class#EgresosController#0" /> <element signature="docComment;method#getValue#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#updateCaja#0;class#EgresosController#0" /> <element signature="docComment;method#readValue#0;class#NumberFormatedTextField#0" />
<element signature="method#updateCaja#0;class#EgresosController#0" /> <element signature="docComment;method#formatText#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#fillTipoEgresoCombo#0;class#EgresosController#0" /> <element signature="e#3266#3267#0" expanded="true" />
<element signature="method#fillTipoEgresoCombo#0;class#EgresosController#0" /> <element signature="e#3317#3318#0" expanded="true" />
<element signature="e#3350#3404#1" /> <element signature="docComment;method#focusGained#0;class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#fillEgresosTable#0;class#EgresosController#0" /> <element signature="docComment;method#focusLost#0;class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
<element signature="method#fillEgresosTable#0;class#EgresosController#0" /> <element signature="e#3955#3968#0" />
<element signature="e#3739#3796#1" />
<element signature="docComment;method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="e#5937#6023#1" />
<element signature="docComment;method#guardarActionListener#0;class#EgresosController#0" />
<element signature="method#guardarActionListener#0;class#EgresosController#0" />
<element signature="e#6846#6930#1" />
<element signature="e#6935#7020#1" />
<element signature="docComment;method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="e#7416#7708#1" />
<element signature="docComment;method#editarActionListener#0;class#EgresosController#0" />
<element signature="method#editarActionListener#0;class#EgresosController#0" />
<element signature="e#8348#8870#1" />
<element signature="docComment;method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="docComment;method#updateButtonsEnabled#0;class#EgresosController#0" />
<element signature="method#updateButtonsEnabled#0;class#EgresosController#0" />
<element signature="e#9421#9550#1" />
<element signature="e#9556#9687#1" />
<element signature="docComment;method#guardarEgreso#0;class#EgresosController#0" />
<element signature="method#guardarEgreso#0;class#EgresosController#0" />
<element signature="e#10066#10502#1" />
<element signature="docComment;method#editarEgreso#0;class#EgresosController#0" />
<element signature="method#editarEgreso#0;class#EgresosController#0" />
<element signature="e#10919#11404#1" />
<element signature="docComment;method#validateInput#0;class#EgresosController#0" />
<element signature="method#validateInput#0;class#EgresosController#0" />
<element signature="docComment;method#validateNro#0;class#EgresosController#0" />
<element signature="method#validateNro#0;class#EgresosController#0" />
<element signature="e#12513#12689#1" />
<element signature="e#12744#12909#1" />
<element signature="docComment;method#validateDescripcion#0;class#EgresosController#0" />
<element signature="method#validateDescripcion#0;class#EgresosController#0" />
<element signature="e#13354#13540#1" />
<element signature="e#13577#13752#1" />
<element signature="docComment;method#validateValor#0;class#EgresosController#0" />
<element signature="method#validateValor#0;class#EgresosController#0" />
<element signature="e#14262#14436#1" />
<element signature="e#14467#14630#1" />
<element signature="e#14689#14850#1" />
<element signature="e#14885#15067#1" />
<element signature="docComment;method#validateTipoEgreso#0;class#EgresosController#0" />
<element signature="method#validateTipoEgreso#0;class#EgresosController#0" />
<element signature="e#15471#15655#1" />
<element signature="docComment;method#validateCaja#0;class#EgresosController#0" />
<element signature="n#!!block;n#validateCaja#0;n#EgresosController#0" />
<element signature="docComment;method#hideErrorMessages#0;class#EgresosController#0" />
<element signature="method#hideErrorMessages#0;class#EgresosController#0" />
<element signature="docComment;method#clearInputs#0;class#EgresosController#0" />
<element signature="method#clearInputs#0;class#EgresosController#0" />
<element signature="docComment;method#normalizeInputs#0;class#EgresosController#0" />
<element signature="method#normalizeInputs#0;class#EgresosController#0" />
<element signature="docComment;method#resetFocus#0;class#EgresosController#0" />
<element signature="class#GuardarAction#0;class#EgresosController#0" />
<element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#EgresosController#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -238,7 +182,6 @@
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" /> <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/AbstractController.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/AbstractController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" />
@@ -257,15 +200,16 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" />
</list> </list>
</option> </option>
</component> </component>
@@ -283,17 +227,7 @@
</component> </component>
<component name="MavenProjectNavigator"> <component name="MavenProjectNavigator">
<treeState> <treeState>
<expand> <expand />
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="caja" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="caja" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Run Configurations" type="21c1f71a:MavenProjectsStructure$RunConfigurationsNode" />
</path>
</expand>
<select /> <select />
</treeState> </treeState>
</component> </component>
@@ -343,7 +277,7 @@
<item name="caja" type="462c0819:PsiDirectoryNode" /> <item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" /> <item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="controllers" type="462c0819:PsiDirectoryNode" /> <item name="views" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" /> <item name="caja" type="b2602c69:ProjectViewProjectNode" />
@@ -351,11 +285,7 @@
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" /> <item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" /> <item name="views" type="462c0819:PsiDirectoryNode" />
</path> <item name="components" type="462c0819:PsiDirectoryNode" />
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="database" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
@@ -559,7 +489,8 @@
<workItem from="1546533252017" duration="4537000" /> <workItem from="1546533252017" duration="4537000" />
<workItem from="1546719990258" duration="3560000" /> <workItem from="1546719990258" duration="3560000" />
<workItem from="1546732125785" duration="5958000" /> <workItem from="1546732125785" duration="5958000" />
<workItem from="1546743888328" duration="2596000" /> <workItem from="1546743888328" duration="3461000" />
<workItem from="1546786771755" duration="2040000" />
</task> </task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora"> <task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created> <created>1545280618093</created>
@@ -785,11 +716,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1546746290385</updated> <updated>1546746290385</updated>
</task> </task>
<option name="localTasksCounter" value="33" /> <task id="LOCAL-00033" summary="NumberFormatTextField agregado en el campo value de egresos y el total egresos">
<created>1546746736204</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1546746736204</updated>
</task>
<option name="localTasksCounter" value="34" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="214106000" /> <option name="totallyTimeSpent" value="217011000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@@ -804,7 +742,7 @@
<frame x="0" y="-18" width="1366" height="765" extended-state="6" /> <frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" weight="0.20776255" /> <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" weight="0.2108067" />
<window_info id="Image Layers" order="1" /> <window_info id="Image Layers" order="1" />
<window_info id="Designer" order="2" /> <window_info id="Designer" order="2" />
<window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.32952815" /> <window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.32952815" />
@@ -813,7 +751,7 @@
<window_info id="simpleUML" order="6" weight="0.329429" /> <window_info id="simpleUML" order="6" weight="0.329429" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32744783" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32744783" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="2" sideWeight="0.49923897" weight="0.3258427" /> <window_info active="true" anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="2" sideWeight="0.49923897" visible="true" weight="0.3258427" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39968896" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.39968896" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -824,12 +762,13 @@
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50076103" side_tool="true" weight="0.24077046" /> <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50076103" side_tool="true" weight="0.24077046" />
<window_info anchor="bottom" id="Messages" order="11" weight="0.32744783" /> <window_info anchor="bottom" id="Messages" order="11" weight="0.32744783" />
<window_info anchor="bottom" id="Database Console" order="12" weight="0.32744783" /> <window_info anchor="bottom" id="Database Console" order="12" weight="0.32744783" />
<window_info anchor="right" x="0" y="0" width="291" height="565" id="Documentation" side_tool="true" weight="0.32952815" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" show_stripe_button="false" weight="0.24961948" /> <window_info anchor="right" id="Ant Build" order="1" show_stripe_button="false" weight="0.24961948" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" /> <window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Theme Preview" order="4" /> <window_info anchor="right" id="Theme Preview" order="4" />
<window_info anchor="right" id="Maven" order="5" show_stripe_button="false" weight="0.32876712" /> <window_info anchor="right" id="Maven" order="5" weight="0.32876712" />
<window_info anchor="right" id="Capture Analysis" order="6" /> <window_info anchor="right" id="Capture Analysis" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" /> <window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Database" order="8" weight="0.32648402" /> <window_info anchor="right" id="Database" order="8" weight="0.32648402" />
@@ -893,7 +832,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="Creada seccion de ingresos completa." />
<MESSAGE value="Mejorada interaccion con las vistas :3" /> <MESSAGE value="Mejorada interaccion con las vistas :3" />
<MESSAGE value="Cambiado JButtons de ManagerView por JToggleButtons" /> <MESSAGE value="Cambiado JButtons de ManagerView por JToggleButtons" />
<MESSAGE value="Build rota pero avanzando para conseguir que todo funcione unido a una caja" /> <MESSAGE value="Build rota pero avanzando para conseguir que todo funcione unido a una caja" />
@@ -918,16 +856,14 @@
<MESSAGE value="Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields" /> <MESSAGE value="Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields" />
<MESSAGE value="Mejora de los NumberFormatedTextFields" /> <MESSAGE value="Mejora de los NumberFormatedTextFields" />
<MESSAGE value="NumberFormatTextField agregado en el campo value de ingresos y formateado los campos integer en los tablemodels" /> <MESSAGE value="NumberFormatTextField agregado en el campo value de ingresos y formateado los campos integer en los tablemodels" />
<option name="LAST_COMMIT_MESSAGE" value="NumberFormatTextField agregado en el campo value de ingresos y formateado los campos integer en los tablemodels" /> <MESSAGE value="NumberFormatTextField agregado en el campo value de egresos y el total egresos" />
<option name="LAST_COMMIT_MESSAGE" value="NumberFormatTextField agregado en el campo value de egresos y el total egresos" />
</component> </component>
<component name="antWorkspaceConfiguration"> <component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_egreso/MysqlTipoEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java" /> <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" /> <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" /> <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" />
@@ -1120,13 +1056,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console.sql"> <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console.sql">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="598"> <state relative-caret-position="598">
@@ -1281,40 +1210,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301">
<caret line="97" selection-start-line="97" selection-end-line="97" />
<folding>
<element signature="docComment;class#NumberFormatedTextField#0" />
<element signature="docComment;method#NumberFormatedTextField#0;class#NumberFormatedTextField#0" />
<element signature="method#NumberFormatedTextField#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#setValue#0;class#NumberFormatedTextField#0" />
<element signature="method#setValue#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#getValue#0;class#NumberFormatedTextField#0" />
<element signature="method#getValue#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#readValue#0;class#NumberFormatedTextField#0" />
<element signature="method#readValue#0;class#NumberFormatedTextField#0" />
<element signature="e#2346#2525#0" />
<element signature="e#2437#2515#1" />
<element signature="e#2551#2595#0" />
<element signature="docComment;method#formatText#0;class#NumberFormatedTextField#0" />
<element signature="n#!!block;n#formatText#0;n#NumberFormatedTextField#0" />
<element signature="class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#focusGained#0;class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#focusLost#0;class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
<element signature="method#focusLost#0;class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
<element signature="class#FieldKeyAdapter#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#keyTyped#0;class#FieldKeyAdapter#0;class#NumberFormatedTextField#0" />
<element signature="method#keyTyped#0;class#FieldKeyAdapter#0;class#NumberFormatedTextField#0" />
<element signature="e#3601#3811#1" />
<element signature="e#3623#3709#0" />
<element signature="e#3736#3797#0" />
<element signature="e#3905#3949#1" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230"> <state relative-caret-position="230">
@@ -1335,9 +1230,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23"> <state relative-caret-position="23">
@@ -1444,10 +1336,13 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="117">
<caret line="399" column="37" selection-start-line="399" selection-start-column="37" selection-end-line="399" selection-end-column="37" /> <caret line="87" column="37" selection-start-line="87" selection-start-column="37" selection-end-line="87" selection-end-column="37" />
<folding> <folding>
<element signature="docComment;class#EgresosController#0" /> <element signature="docComment;class#EgresosController#0" />
<element signature="docComment;method#EgresosController#0;class#EgresosController#0" /> <element signature="docComment;method#EgresosController#0;class#EgresosController#0" />
@@ -1497,12 +1392,6 @@
<element signature="method#validateDescripcion#0;class#EgresosController#0" /> <element signature="method#validateDescripcion#0;class#EgresosController#0" />
<element signature="e#13354#13540#1" /> <element signature="e#13354#13540#1" />
<element signature="e#13577#13752#1" /> <element signature="e#13577#13752#1" />
<element signature="docComment;method#validateValor#0;class#EgresosController#0" />
<element signature="method#validateValor#0;class#EgresosController#0" />
<element signature="e#14262#14436#1" />
<element signature="e#14467#14630#1" />
<element signature="e#14689#14850#1" />
<element signature="e#14885#15067#1" />
<element signature="docComment;method#validateTipoEgreso#0;class#EgresosController#0" /> <element signature="docComment;method#validateTipoEgreso#0;class#EgresosController#0" />
<element signature="method#validateTipoEgreso#0;class#EgresosController#0" /> <element signature="method#validateTipoEgreso#0;class#EgresosController#0" />
<element signature="e#15471#15655#1" /> <element signature="e#15471#15655#1" />
@@ -1521,6 +1410,55 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/mariuszgromada/math/MathParser.org-mXparser/4.2.0/MathParser.org-mXparser-4.2.0.jar!/org/mariuszgromada/math/mxparser/Argument.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="13" column="50" selection-start-line="13" selection-start-column="50" selection-end-line="14" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/mariuszgromada/math/MathParser.org-mXparser/4.2.0/MathParser.org-mXparser-4.2.0-sources.jar!/org/mariuszgromada/math/mxparser/Argument.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1334">
<caret line="110" column="13" selection-start-line="110" selection-start-column="13" selection-end-line="110" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<caret line="106" column="31" lean-forward="true" selection-start-line="58" selection-end-line="106" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/mariuszgromada/math/MathParser.org-mXparser/4.2.0/MathParser.org-mXparser-4.2.0-sources.jar!/org/mariuszgromada/math/mxparser/Expression.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="4899" column="41" selection-start-line="4899" selection-start-column="41" selection-end-line="4905" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="89" column="27" selection-start-line="89" selection-start-column="27" selection-end-line="89" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
<element signature="docComment;class#NumberFormatedTextField#0" />
<element signature="docComment;method#NumberFormatedTextField#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#setValue#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#getValue#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#readValue#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#formatText#0;class#NumberFormatedTextField#0" />
<element signature="e#3266#3267#0" expanded="true" />
<element signature="e#3317#3318#0" expanded="true" />
<element signature="docComment;method#focusGained#0;class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
<element signature="docComment;method#focusLost#0;class#FieldFocusListener#0;class#NumberFormatedTextField#0" />
<element signature="e#3955#3968#0" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
@@ -1539,10 +1477,10 @@
<settings> <settings>
<artifact-editor> <artifact-editor>
<show-content> <show-content>
<type id="library" />
<type id="javaee-facet-resources" />
<type id="artifact" />
<type id="jpa-descriptors" /> <type id="jpa-descriptors" />
<type id="javaee-facet-resources" />
<type id="library" />
<type id="artifact" />
</show-content> </show-content>
</artifact-editor> </artifact-editor>
<last-edited>caja:jar</last-edited> <last-edited>caja:jar</last-edited>
@@ -1617,7 +1555,7 @@
</state> </state>
<state key="ProjectLibrariesConfigurable.UI"> <state key="ProjectLibrariesConfigurable.UI">
<settings> <settings>
<last-edited>forms_rt</last-edited> <last-edited>org.mariuszgromada.math:MathParser.org-mXparser:4.2.0</last-edited>
<splitter-proportions> <splitter-proportions>
<option name="proportions"> <option name="proportions">
<list> <list>

View File

@@ -22,5 +22,6 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" name="org.mariuszgromada.math:MathParser.org-mXparser:4.2.0" level="project" />
</component> </component>
</module> </module>

BIN
dist/caja.jar vendored

Binary file not shown.

BIN
dist/database.sqlite vendored

Binary file not shown.

View File

@@ -48,6 +48,7 @@ import danielcortes.xyz.models.tipo_ingreso.MysqlTipoIngresoDAO;
import danielcortes.xyz.models.tipo_ingreso.SQLiteTipoIngresoDAO; import danielcortes.xyz.models.tipo_ingreso.SQLiteTipoIngresoDAO;
import danielcortes.xyz.models.tipo_ingreso.TipoIngresoDAO; import danielcortes.xyz.models.tipo_ingreso.TipoIngresoDAO;
import danielcortes.xyz.views.ManagerView; import danielcortes.xyz.views.ManagerView;
import org.mariuszgromada.math.mxparser.Expression;
import javax.swing.*; import javax.swing.*;
import java.sql.SQLException; import java.sql.SQLException;

View File

@@ -24,6 +24,8 @@
package danielcortes.xyz.views.components; package danielcortes.xyz.views.components;
import org.mariuszgromada.math.mxparser.Expression;
import javax.swing.*; import javax.swing.*;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
import java.awt.event.FocusListener; import java.awt.event.FocusListener;
@@ -37,7 +39,7 @@ import java.text.ParseException;
* con el metodo getValue. Ademas de tener comportamientos especiales: * con el metodo getValue. Ademas de tener comportamientos especiales:
* - Al ganar foco se selecciona todo el texto. * - Al ganar foco se selecciona todo el texto.
* - Al perder foco formatea el texto como numero. * - Al perder foco formatea el texto como numero.
* - Solo se pueden ingresar 9 digitos. * - Evalua la operacion matematica que se ingrese en el campo
*/ */
public class NumberFormatedTextField extends JTextField { public class NumberFormatedTextField extends JTextField {
private int value; private int value;
@@ -52,7 +54,6 @@ public class NumberFormatedTextField extends JTextField {
this.nf = NumberFormat.getIntegerInstance(); this.nf = NumberFormat.getIntegerInstance();
this.addFocusListener(new FieldFocusListener()); this.addFocusListener(new FieldFocusListener());
this.addKeyListener(new FieldKeyAdapter());
} }
/** /**
@@ -76,16 +77,16 @@ public class NumberFormatedTextField extends JTextField {
} }
/** /**
* Lee el valor en el texto y lo almacena en la instancia * Lee el valor en el texto, ejecuta la operacion matematica que en caso que exista una y la almacena en el valor
* Si la operacion matematica es invalida, almacenara un 0
*/ */
private void readValue(){ private void readValue(){
try { String currentText = this.getText();
String currentText = this.getText(); Expression expression = new Expression(currentText);
if(currentText.length() > 0){ if(expression.checkSyntax()){
this.value = nf.parse(currentText).intValue(); this.value = (int) Math.floor(expression.calculate());
} }else{
} catch (ParseException e) { this.value = 0;
e.printStackTrace();
} }
} }
@@ -114,30 +115,4 @@ public class NumberFormatedTextField extends JTextField {
NumberFormatedTextField.this.formatText(); NumberFormatedTextField.this.formatText();
} }
} }
private class FieldKeyAdapter extends KeyAdapter{
/**
* Solo permitir introducir un maximo de 9 digitos
*/
@Override
public void keyTyped(KeyEvent e) {
String currentText = NumberFormatedTextField.this.getText();
int parsedText = 0;
if(currentText.length() > 0) {
try {
parsedText = nf.parse(currentText).intValue();
} catch (ParseException e1) {
e1.printStackTrace();
}
}
int length = String.valueOf(parsedText).length();
if (length >= 9) {
e.consume();
}
}
}
} }