Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[502] trunk
|
From: <and...@us...> - 2008-08-24 14:22:01
|
Revision: 502
http://ggc.svn.sourceforge.net/ggc/?rev=502&view=rev
Author: andyrozman
Date: 2008-08-24 14:22:06 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc/build/GGCVersion.properties
trunk/ggc/build/History.txt
trunk/ggc/data/update/GGC_Update.properties
trunk/ggc/src/Changelog
trunk/ggc/src/How_To_Upgrade.txt
trunk/ggc/src/ggc/GGC.java
trunk/ggc/src/ggc/core/nutrition/NutritionTreeDialog.java
trunk/ggc-cgm/src/ggc/cgm/device/minimed/MinimedCareLinkData.java
trunk/ggc-cgm/src/ggc/cgm/gui/CGMDisplayDataDialog.java
trunk/ggc-cgm/src/ggc/cgm/gui/CGMExportDialog.java
trunk/ggc-meter/.classpath
trunk/ggc-meter/src/ggc/meter/data/MeterValuesTable.java
trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java
trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java
trunk/ggc-meter/src/ggc/meter/test/MeterConsoleTester.java
trunk/ggc-plugin_base/.classpath
trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java
trunk/ggc-pump/.classpath
trunk/ggc-pump/src/ggc/core/db/hibernate/DayValueH.java
trunk/ggc-pump/src/ggc/pump/data/PumpValuesTableModel.java
trunk/ggc-pump/src/ggc/pump/device/PumpException.java
trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java
trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java
trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedCareLinkData.java
trunk/ggc-pump/src/ggc/pump/gui/PumpDisplayDataDialog.java
trunk/ggc-pump/src/ggc/pump/gui/config/SimpleConfigurationHelp.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
Removed Paths:
-------------
trunk/data/
trunk/ggc-cgm/src/ggc/cgm/list/
Property Changed:
----------------
trunk/ggc-pump/
Modified: trunk/ggc/build/GGCVersion.properties
===================================================================
--- trunk/ggc/build/GGCVersion.properties 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/build/GGCVersion.properties 2008-08-24 14:22:06 UTC (rev 502)
@@ -6,13 +6,13 @@
#
# Core Version
#
-ggc-core.version=0.3
+ggc-core.version=0.3.3
#
# Main GUI Version (this version is same as Core always)
#
-ggc-main.version=0.3
+ggc-main.version=0.3.3
#
@@ -24,5 +24,5 @@
#
# Lang version (this one has it's own versioning too). See history.txt
#
-ggc-lang.version=0.2.5
+ggc-lang.version=0.2.7
Modified: trunk/ggc/build/History.txt
===================================================================
--- trunk/ggc/build/History.txt 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/build/History.txt 2008-08-24 14:22:06 UTC (rev 502)
@@ -22,6 +22,9 @@
0.2.2 -> 0.2.13.1 (added keywords)
0.2.3 -> 0.2.13.1 (added keywords)
0.2.4 -> 0.2.15 (more translation for de added)
+0.2.5 -> 0.2.19
+0.2.6 -> 0.3
+0.2.7 -> 0.3.3
Modified: trunk/ggc/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc/data/update/GGC_Update.properties 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/data/update/GGC_Update.properties 2008-08-24 14:22:06 UTC (rev 502)
@@ -76,14 +76,14 @@
COMPONENT_1_VERSION=0.3
COMPONENT_1_VERSION_NUM=1
COMPONENT_1_ROOT_DIR=/lib/ggc
-COMPONENT_1_FILES=%ROOT%/ggc-main-0.3.2.jar
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.3.3.jar
COMPONENT_2_GROUP=1
COMPONENT_2_NAME=GGC Core
COMPONENT_2_VERSION=0.3
COMPONENT_2_VERSION_NUM=1
COMPONENT_2_ROOT_DIR=/lib/ggc
-COMPONENT_2_FILES=%ROOT%/ggc-core-0.3.2.jar
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.3.3.jar
COMPONENT_3_GROUP=1
COMPONENT_3_NAME=GGC Little
@@ -98,124 +98,124 @@
COMPONENT_4_VERSION=0.2.5
COMPONENT_4_VERSION_NUM=1
COMPONENT_4_ROOT_DIR=/lib/ggc
-COMPONENT_4_FILES=%ROOT%/ggc-lang-0.2.6.jar
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.2.7.jar
-COMPONENT_18_GROUP=2
-COMPONENT_18_NAME=GGC Plugin Base
-COMPONENT_18_VERSION=0.1.3
-COMPONENT_18_VERSION_NUM=1
-COMPONENT_18_ROOT_DIR=/lib/ggc
-COMPONENT_18_FILES=%ROOT%/ggc-plugin_base-0.1.4.jar
-
-
-
COMPONENT_5_GROUP=2
-COMPONENT_5_NAME=Meter Tool
-COMPONENT_5_VERSION=0.3.3
+COMPONENT_5_NAME=GGC Plugin Base
+COMPONENT_5_VERSION=0.1.5
COMPONENT_5_VERSION_NUM=1
COMPONENT_5_ROOT_DIR=/lib/ggc
-COMPONENT_5_FILES=%ROOT%/ggc-meter_tool-0.3.3.jar
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.1.5.jar
+
+
COMPONENT_6_GROUP=2
-COMPONENT_6_NAME=Pump Tool
-COMPONENT_6_VERSION=N/A
+COMPONENT_6_NAME=Meter Tool
+COMPONENT_6_VERSION=0.3.3
COMPONENT_6_VERSION_NUM=1
-COMPONENT_6_ROOT_DIR=
-COMPONENT_6_FILES=
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-0.3.3.jar
-
COMPONENT_7_GROUP=2
-COMPONENT_7_NAME=CGMS Tool
+COMPONENT_7_NAME=Pump Tool
COMPONENT_7_VERSION=N/A
COMPONENT_7_VERSION_NUM=1
COMPONENT_7_ROOT_DIR=
COMPONENT_7_FILES=
-COMPONENT_8_GROUP=3
-COMPONENT_8_NAME=Hibernate Framework
-COMPONENT_8_VERSION=3.1
-#COMPONENT_7_VERSION=3.2.6 GA
+COMPONENT_8_GROUP=2
+COMPONENT_8_NAME=CGMS Tool
+COMPONENT_8_VERSION=N/A
COMPONENT_8_VERSION_NUM=1
-COMPONENT_8_ROOT_DIR=/lib/hibernate3
-COMPONENT_8_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
-#COMPONENT_7_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+COMPONENT_8_ROOT_DIR=
+COMPONENT_8_FILES=
+
COMPONENT_9_GROUP=3
-COMPONENT_9_NAME=Internal Database [H2]
-COMPONENT_9_VERSION=1.0.69
+COMPONENT_9_NAME=Hibernate Framework
+COMPONENT_9_VERSION=3.1
+#COMPONENT_7_VERSION=3.2.6 GA
COMPONENT_9_VERSION_NUM=1
-COMPONENT_9_ROOT_DIR=/lib/jdbc
-COMPONENT_9_FILES=%ROOT%/h2-1.0.69.jar
+COMPONENT_9_ROOT_DIR=/lib/hibernate3
+COMPONENT_9_FILES=%ROOT%/antlr-2.7.6rc1.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.0.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.1.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
+#COMPONENT_9_FILES=%ROOT%/antlr-2.7.6.jar;%ROOT%/asm.jar;%ROOT%/asm-attrs.jar;%ROOT%/c3p0-0.9.1.jar;%ROOT%/cglib-2.1.3.jar;%ROOT%/commons-collections-2.1.1.jar;%ROOT%/commons-lang.jar;%ROOT%/commons-lang-2.0.jar;%ROOT%/commons-logging-1.0.4.jar;%ROOT%/dom4j-1.6.1.jar;%ROOT%/ehcache-1.2.3.jar;%ROOT%/hibernate3.jar;%ROOT%/jdbc2_0-stdext.jar;%ROOT%/jta.jar;%ROOT%/log4j-1.2.11.jar
COMPONENT_10_GROUP=3
-COMPONENT_10_NAME=Atech Tools
-COMPONENT_10_VERSION=0.2.1
+COMPONENT_10_NAME=Internal Database [H2]
+COMPONENT_10_VERSION=1.0.69
COMPONENT_10_VERSION_NUM=1
-COMPONENT_10_ROOT_DIR=/lib/utils
-COMPONENT_10_FILES=%ROOT%/atech-tools-0.2.3.jar
+COMPONENT_10_ROOT_DIR=/lib/jdbc
+COMPONENT_10_FILES=%ROOT%/h2-1.0.69.jar
COMPONENT_11_GROUP=3
-COMPONENT_11_NAME=iText Pdf Library
-COMPONENT_11_VERSION=2.0.7
+COMPONENT_11_NAME=Atech Tools
+COMPONENT_11_VERSION=0.2.1
COMPONENT_11_VERSION_NUM=1
COMPONENT_11_ROOT_DIR=/lib/utils
-COMPONENT_11_FILES=%ROOT%/iText-2.0.7.jar
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.2.4.jar
COMPONENT_12_GROUP=3
-COMPONENT_12_NAME=RxtxComm API
-COMPONENT_12_VERSION=2.1.7
+COMPONENT_12_NAME=iText Pdf Library
+COMPONENT_12_VERSION=2.0.7
COMPONENT_12_VERSION_NUM=1
COMPONENT_12_ROOT_DIR=/lib/utils
-COMPONENT_12_FILES=%ROOT%/RXTXcomm-2.1.7.jar
-COMPONENT_12_PLATFORM_SPECIFIC=true
-COMPONENT_12_PLATFORM_SPECIFIC_TYPE=2
-COMPONENT_12_PLATFORM_SUPPORTED=win linux mac solaris
+COMPONENT_12_FILES=%ROOT%/iText-2.0.7.jar
+
+COMPONENT_13_GROUP=3
+COMPONENT_13_NAME=RxtxComm API
+COMPONENT_13_VERSION=2.1.7
+COMPONENT_13_VERSION_NUM=1
+COMPONENT_13_ROOT_DIR=/lib/utils
+COMPONENT_13_FILES=%ROOT%/RXTXcomm-2.1.7-a1.jar
+COMPONENT_13_PLATFORM_SPECIFIC=true
+COMPONENT_13_PLATFORM_SPECIFIC_TYPE=2
+COMPONENT_13_PLATFORM_SUPPORTED=win linux mac solaris
#COMPONENT_11_PLATFORM_SPECIFIC_JAR_WIN=jar_win.jar
#COMPONENT_11_PLATFORM_SPECIFIC_JAR_LINUX=jar_linux.jar
#COMPONENT_11_PLATFORM_SPECIFIC_JAR_MAC=jar_mac.jar
#COMPONENT_11_PLATFORM_SPECIFIC_JAR_SOLARIS=jar_solaris.jar
-COMPONENT_13_GROUP=3
-COMPONENT_13_NAME=Skin L&F
-COMPONENT_13_VERSION=6.7
-COMPONENT_13_VERSION_NUM=1
-COMPONENT_13_ROOT_DIR=/lib/utils
-COMPONENT_13_FILES=%ROOT%/skinlf-6.7.jar
-
COMPONENT_14_GROUP=3
-COMPONENT_14_NAME=JFreeChart
-COMPONENT_14_VERSION=1.0.9
+COMPONENT_14_NAME=Skin L&F
+COMPONENT_14_VERSION=6.7
COMPONENT_14_VERSION_NUM=1
-COMPONENT_14_ROOT_DIR=/lib/jfreechart
-COMPONENT_14_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
+COMPONENT_14_ROOT_DIR=/lib/utils
+COMPONENT_14_FILES=%ROOT%/skinlf-6.7.jar
-
COMPONENT_15_GROUP=3
-COMPONENT_15_NAME=Java Help
-COMPONENT_15_VERSION=2.0.5
+COMPONENT_15_NAME=JFreeChart
+COMPONENT_15_VERSION=1.0.9
COMPONENT_15_VERSION_NUM=1
-COMPONENT_15_ROOT_DIR=/lib/utils
-COMPONENT_15_FILES=%ROOT%/jhall-2.0.5.jar
+COMPONENT_15_ROOT_DIR=/lib/jfreechart
+COMPONENT_15_FILES=%ROOT%/jcommon-1.0.12.jar;%ROOT%/jfreechart-1.0.9.jar;%ROOT%/jfreechart-1.0.9-experimental.jar;%ROOT%/jfreechart-1.0.9-swt.jar;%ROOT%/swtgraphics2d.jar
COMPONENT_16_GROUP=3
-COMPONENT_16_NAME=Log4j
-COMPONENT_16_VERSION=1.2.15
+COMPONENT_16_NAME=Java Help
+COMPONENT_16_VERSION=2.0.5
COMPONENT_16_VERSION_NUM=1
COMPONENT_16_ROOT_DIR=/lib/utils
-COMPONENT_16_FILES=%ROOT%/log4j-1.2.15.jar
+COMPONENT_16_FILES=%ROOT%/jhall-2.0.5.jar
+
COMPONENT_17_GROUP=3
-COMPONENT_17_NAME=Pygmy Http Daemon
-COMPONENT_17_VERSION=0.2
+COMPONENT_17_NAME=Log4j
+COMPONENT_17_VERSION=1.2.15
COMPONENT_17_VERSION_NUM=1
COMPONENT_17_ROOT_DIR=/lib/utils
-COMPONENT_17_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+COMPONENT_17_FILES=%ROOT%/log4j-1.2.15.jar
+COMPONENT_18_GROUP=3
+COMPONENT_18_NAME=Pygmy Http Daemon
+COMPONENT_18_VERSION=0.2
+COMPONENT_18_VERSION_NUM=1
+COMPONENT_18_ROOT_DIR=/lib/utils
+COMPONENT_18_FILES=%ROOT%/pygmy-core-0.2.jar;%ROOT%/pygmy-handlers-0.2.jar
+
#COMPONENT_13_GROUP=3
#COMPONENT_13_NAME=Java Help
#COMPONENT_13_VERSION=2.0.5
Modified: trunk/ggc/src/Changelog
===================================================================
--- trunk/ggc/src/Changelog 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/src/Changelog 2008-08-24 14:22:06 UTC (rev 502)
@@ -1,3 +1,14 @@
+
+2008-08-20 (0.3.3)
+ * Nutrition Tree is fixed (bug on FreeBSD system, maybe even on linux)
+ * Added How_To_Update.txt
+ * fixed statup creation for non-windows systems
+
+2008-08-20 (0.3.2)
+ * Bolus Helper fixes
+ * Source code changes to remove java warnings
+
+
2008-08-13 (0.3.1) Andy
* Bolus Helper first implementation (needed some fixes and also extended and basic ratios done)
Modified: trunk/ggc/src/How_To_Upgrade.txt
===================================================================
--- trunk/ggc/src/How_To_Upgrade.txt 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/src/How_To_Upgrade.txt 2008-08-24 14:22:06 UTC (rev 502)
@@ -10,28 +10,107 @@
===============
-At this point our application has no ability to make automatic upgrades. Because of this all updates need to be applied
-manually.
+At this point our application has no ability to make automatic upgrades. Because of this all updates need
+to be applied manually.
-Problem with all database applications is that we need to make update to application and to database. Because of this
-our updates have special tag in name (for example db_v5). You need to look into README file to determine which version
-of database update needs. In our application there is option to backup database (Tools->Database Maintainance->Backup).
-At this point Restore option is not available, but it will be available in one of our first updates. We will change
-this document accordingly.
+Problem with all database applications is that we need to make update to application and to database. In each
+update package there will be file, with all releases listed and version of database they use. Depending on
+information found there you will select which upgrade way to go. (difference is in step 2)
-According to database tag, you have now two options of update. (see A, B)
-
HOW ARE UPDATE FILES PACKAGED
=============================
+Update files contain this document (in future in all supported languages), file database_info.txt, with database
+information and Changes_<version>.txt (this is condensed version of Changes.txt document in SVN). Next there are
+directories that you need to update. There will be at least two directories there, sometimes three.
+ - data: contains update file, which tells us which versions we are currently using (this is used to
+ generate startup files, when you run run_<os_name>.<os_ext> batch script).
+ - libs: contains all libraries and our software
+ - bin: contains script
+ - docs: contains this documentation
+
+How to apply this update will be shown in few steps. Please follow them to the letter.
+STEP 1: Create backup copy of your data
+----------------------------------------
+Start GNU Gluco Control and wait for it to load, then go to Tools -> Database Maintainance -> Database backup.
-HOW TO UPGRADE IF DATABASE VERSION IS THE SAME
-==============================================
+In next window select all object and click on backup. New backup file will be created in data\export
+directory (GGC backup <year>_<month>_<day> <hour>_<minute>_<second>. Copy it to same safe location.
+Close GNU Gluco Control.
+
+STEP 2: Create backup copy of application
+------------------------------------------
+
+Open your favorite File manager and create directory somewhere (probably something like
+GGC_Backup_<current_date>). Copy whole GGC instalation there (it should have at least bin, lib and data
+subdirectories, sometime also jre). Copy all of them.
+
+This copy will be used in case that something goes wrong in next steps.
+
+
+
+STEP 3: Make actual update
+---------------------------
+
+Please take a look at database_info.txt file. You need to compare last entry (current version) and version
+you have installed (it is displayed in title bar when you start application). If the versions are the same
+go to step 3A if not step 3B.
+
+
+STEP 3.A: Update with same version
+-----------------------------------
+
+Use File manager (I advise to use some that has integrated Zip archiver) and open archive file, you need to
+copy everything into your instalation directory. You will be asked to overwrite some files, you need to
+overwrite all files there.
+
+
+STEP 3.B: Update with different version
+----------------------------------------
+
+1. Do all actions in STEP 3.A
+
+2. Run run_<os_name>.<os_extension>. Application will display some errors, this is OK. We needed to run this
+ script just to recreate startup script. Close application as soon as you can.
+
+3. Now you have new scripts. You need to run init_db.<os_extension> which will recreate database
+
+
+
+STEP 4: Start new version of application
+-----------------------------------------
+
+Start application, which should now start without problems.
+
+
+STEP 4.A: Starting with same version
+-------------------------------------
+
+When application is started you should have all your data there, since we didn't do any changes to
+our database
+
+
+STEP 4.B: Starting with different version
+------------------------------------------
+
+Now when application is started there will be no data available anymore. Database was totally recreated
+(and also deleted), so it's "clean" now. You will have to do following to get your data back. Click on
+Tools -> Database Maintainance -> Backup Restore. Select file you created in step 1 and in next window
+select all objects and click on Restore. After restart all your data should be there.
+
+
+STEP 5: Finished
+-----------------
+
+Update is finished.
+
+
+If you had any problems with update please contact us, and we will help you. (gg...@at...)
Modified: trunk/ggc/src/ggc/GGC.java
===================================================================
--- trunk/ggc/src/ggc/GGC.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/src/ggc/GGC.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -51,9 +51,9 @@
private static MainFrame s_mainWindow;
// Version information
- public static String s_version = "0.3.2";
+ public static String s_version = "0.3.3";
public static String full_version = "v" + s_version;
- public static String version_date = "21th August 2008";
+ public static String version_date = "24th August 2008";
public static boolean isDbOk()
{
Modified: trunk/ggc/src/ggc/core/nutrition/NutritionTreeDialog.java
===================================================================
--- trunk/ggc/src/ggc/core/nutrition/NutritionTreeDialog.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc/src/ggc/core/nutrition/NutritionTreeDialog.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -57,6 +57,7 @@
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTree;
+import javax.swing.SwingUtilities;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreeSelectionModel;
@@ -386,26 +387,31 @@
public void mouseReleased(MouseEvent me)
{
- // System.out.println("Mouse released");
+ //System.out.println("Mouse released");
+
+ //System.out.println("MouseEvent trigger: " + me.isPopupTrigger());
+ //System.out.println("MouseEvent Right Mouse: " + SwingUtilities.isRightMouseButton(me));
+
- if (me.isPopupTrigger()) // right click, show popup menu
+ if ((me.isPopupTrigger()) || // right click, show popup menu
+ (SwingUtilities.isRightMouseButton(me)))
{
+ //System.out.println("In pop trigger");
mouse_selected_object = tree.getClosestPathForLocation(me.getX(), me.getY()).getLastPathComponent();
tree.setSelectionPath(tree.getClosestPathForLocation(me.getX(), me.getY()));
- // System.out.println("MouseSelected: " + mouse_selected_object);
- // System.out.println(me.getSource());
- // mouse_selected_object = me.getSource();
+ //System.out.println("MouseSelected: " + mouse_selected_object);
+ //System.out.println(me.getSource());
createMenu();
- // System.out.println("Mouse: popUp trigger");
+ //System.out.println("Mouse: popUp trigger");
// pop.add(new MenuItem("Test"));
pop.show(me.getComponent(), me.getX(), me.getY());
}
else
{
- // System.out.println("Mouse: popUp NO trigger");
- // put the image stuff here
+ //System.out.println("Mouse: popUp NO trigger");
+ //put the image stuff here
}
}
Modified: trunk/ggc-cgm/src/ggc/cgm/device/minimed/MinimedCareLinkData.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/device/minimed/MinimedCareLinkData.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-cgm/src/ggc/cgm/device/minimed/MinimedCareLinkData.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -11,8 +11,11 @@
private String time; // 2
private String raw_type; // 33
private String raw_values; // 34
+ @SuppressWarnings("unused")
private String raw_id; // 35
+ @SuppressWarnings("unused")
private String raw_upload_id; // 36
+ @SuppressWarnings("unused")
private String raw_seq_num; // 37
private String raw_device_type; // 38
Modified: trunk/ggc-cgm/src/ggc/cgm/gui/CGMDisplayDataDialog.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/gui/CGMDisplayDataDialog.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-cgm/src/ggc/cgm/gui/CGMDisplayDataDialog.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -43,6 +43,8 @@
// private JLabel infoIcon = null;
// x private JLabel infoDescription = null;
+ private static final long serialVersionUID = 5334805788018378266L;
+
CGMReaderRunner mrr;
private DataAccessCGM m_da = DataAccessCGM.getInstance();
Modified: trunk/ggc-cgm/src/ggc/cgm/gui/CGMExportDialog.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/gui/CGMExportDialog.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-cgm/src/ggc/cgm/gui/CGMExportDialog.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -29,6 +29,7 @@
public class CGMExportDialog extends JDialog implements ActionListener, StatusReporterInterface
{
+ private static final long serialVersionUID = -507664311820738400L;
CGMPlugInServer server;
Modified: trunk/ggc-meter/.classpath
===================================================================
--- trunk/ggc-meter/.classpath 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/.classpath 2008-08-24 14:22:06 UTC (rev 502)
@@ -2,11 +2,11 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
<classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
<classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/ggc-meter/src/ggc/meter/data/MeterValuesTable.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/data/MeterValuesTable.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/data/MeterValuesTable.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -26,16 +26,11 @@
import javax.swing.table.TableColumn;
-/**
- * @author stephan
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- */
public class MeterValuesTable extends JTable //implements TableModelListener
{
-//x private I18nControl m_ic = I18nControl.getInstance();
+ private static final long serialVersionUID = -599856528799069838L;
+ //x private I18nControl m_ic = I18nControl.getInstance();
MeterValuesTableModel model = null;
DataAccessMeter m_da = DataAccessMeter.getInstance();
@@ -170,6 +165,7 @@
class CheckCellRenderer extends JCheckBox implements TableCellRenderer
{
+ private static final long serialVersionUID = 8295003650375627769L;
protected Border m_noFocusBorder;
public CheckCellRenderer()
Modified: trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/data/MeterValuesTableModel.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -38,10 +38,10 @@
import javax.swing.table.AbstractTableModel;
-public class MeterValuesTableModel extends AbstractTableModel // implements
- // GlucoValueEventListener
+public class MeterValuesTableModel extends AbstractTableModel
{
+ private static final long serialVersionUID = 7198690314603156531L;
private I18nControl m_ic = I18nControl.getInstance();
// x private DataAccessMeter m_da = DataAccessMeter.getInstance();
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -134,19 +134,11 @@
String serial_port = null;
- public void setSerialPort(String port)
+ public void setSerialPort(String port) throws PlugInBaseException
{
this.serial_port = port;
- try
- {
- this.setPort(port);
- }
- catch(NoSuchPortException ex)
- {
- System.out.println("No Such Port Ex: " + ex);
-
- }
+ this.setPort(port);
}
Modified: trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -7,7 +7,6 @@
import ggc.meter.util.DataAccessMeter;
import ggc.meter.util.I18nControl;
import ggc.plugin.device.DeviceIdentification;
-import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.output.AbstractOutputWriter;
import ggc.plugin.output.OutputUtil;
import ggc.plugin.output.OutputWriter;
@@ -79,7 +78,7 @@
SerialPort.FLOWCONTROL_NONE,
SerialProtocol.SERIAL_EVENT_BREAK_INTERRUPT);
- this.setSerialPort(portName);
+// this.setSerialPort(portName);
data = new ArrayList<MeterValuesEntry>();
@@ -93,12 +92,38 @@
{
System.out.println("Set port: " + portName);
- this.setPort(portName);
+ this.setSerialPort(portName);
+// this.setPort(portName);
if (!this.open())
{
this.m_status = 1;
}
+
+
+ end_string = (new Character((char)13)).toString();
+
+ //this.writer = new GGCFileOutputWriter();
+ this.output_writer.writeHeader();
+
+
+
+ //this.serialPort.
+
+ this.serialPort.notifyOnOutputEmpty(true);
+ this.serialPort.notifyOnBreakInterrupt(true);
+
+
+ this.end_strings = new String[2];
+ end_strings[0] = (new Character((char)3)).toString(); // ETX - End of Text
+ end_strings[1] = (new Character((char)4)).toString(); // EOT - End of Transmission
+ //end_strings[2] = (new Character((char)23)).toString(); // ETB - End of Text
+
+ this.text_def = new String[3];
+ this.text_def[0] = (new Character((char)2)).toString(); // STX - Start of Text
+ this.text_def[1] = (new Character((char)3)).toString(); // ETX - Start of Text
+ this.text_def[2] = (new Character((char)13)).toString(); // EOL - Start of Text
+
}
catch(Exception ex)
{
@@ -107,38 +132,6 @@
}
- end_string = (new Character((char)13)).toString();
-
- //this.writer = new GGCFileOutputWriter();
- this.output_writer.writeHeader();
-
-
-
- //this.serialPort.
-
- this.serialPort.notifyOnOutputEmpty(true);
- this.serialPort.notifyOnBreakInterrupt(true);
-
-
- this.end_strings = new String[2];
- end_strings[0] = (new Character((char)3)).toString(); // ETX - End of Text
- end_strings[1] = (new Character((char)4)).toString(); // EOT - End of Transmission
- //end_strings[2] = (new Character((char)23)).toString(); // ETB - End of Text
-
- this.text_def = new String[3];
- this.text_def[0] = (new Character((char)2)).toString(); // STX - Start of Text
- this.text_def[1] = (new Character((char)3)).toString(); // ETX - Start of Text
- this.text_def[2] = (new Character((char)13)).toString(); // EOL - Start of Text
-
- /*
- try
- {
- this.serialPort.addEventListener(this);
- }
- catch(Exception ex)
- {
- System.out.println(ex);
- }*/
}
Modified: trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -48,7 +48,6 @@
SerialPort.FLOWCONTROL_NONE,
SerialProtocol.SERIAL_EVENT_NONE);
- this.setSerialPort(portName);
//String portName, int baudrate, int databits, int stopbits, int parity
@@ -63,7 +62,8 @@
try
{
- this.setPort(portName);
+ this.setSerialPort(portName);
+// this.setPort(portName);
if (!this.open())
{
@@ -72,7 +72,7 @@
}
catch(Exception ex)
{
- System.out.println("AscensiaMeter -> Error adding listener: " + ex);
+ System.out.println("OneTouchMeter -> Error adding listener: " + ex);
ex.printStackTrace();
}
}
Modified: trunk/ggc-meter/src/ggc/meter/test/MeterConsoleTester.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/test/MeterConsoleTester.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-meter/src/ggc/meter/test/MeterConsoleTester.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -34,7 +34,6 @@
import ggc.meter.device.onetouch.OneTouchUltra;
import ggc.plugin.output.ConsoleOutputWriter;
import ggc.plugin.protocol.SerialProtocol;
-import gnu.io.CommPortIdentifier;
import java.awt.TextArea;
import java.util.Vector;
@@ -273,13 +272,13 @@
public void displaySerialPorts()
{
- Vector<CommPortIdentifier> vct = SerialProtocol.getAllAvailablePorts();
+ Vector<String> vct = SerialProtocol.getAllAvailablePortsString();
System.out.println(" --- List Serial Ports -----");
for(int i=0; i<vct.size(); i++)
{
- System.out.println(vct.get(i).getName());
+ System.out.println(vct.get(i));
}
}
Modified: trunk/ggc-plugin_base/.classpath
===================================================================
--- trunk/ggc-plugin_base/.classpath 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-plugin_base/.classpath 2008-08-24 14:22:06 UTC (rev 502)
@@ -3,10 +3,10 @@
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-plugin_base/src/ggc/plugin/protocol/SerialProtocol.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -114,9 +114,18 @@
* Set the COM-Port from wich will be read.
* @param String port
*/
- public void setPort(String port) throws NoSuchPortException
+ public void setPort(String port) throws PlugInBaseException
{
- portIdentifier = CommPortIdentifier.getPortIdentifier(port);
+ try
+ {
+ portIdentifier = CommPortIdentifier.getPortIdentifier(port);
+ }
+ catch(NoSuchPortException ex)
+ {
+ System.out.println("SerialProtocol::setPort:: No such port: " + ex);
+ log.error("No such port exception: " + ex.getMessage(), ex);
+ throw new PlugInBaseException(ex);
+ }
}
/**
@@ -626,6 +635,37 @@
}
+
+ public static Vector<String> getAllAvailablePortsString()
+ {
+ Vector<String> retVal = new Vector<String>();
+// Vector<CommPortIdentifier> retVal = new Vector<CommPortIdentifier>();
+
+ try
+ {
+ //Vector retVal = new Vector();
+// int counter = 0;
+
+ //CommPortIdentifier.
+
+ Enumeration<?> enume = CommPortIdentifier.getPortIdentifiers();
+ while (enume.hasMoreElements())
+ {
+ CommPortIdentifier portID = (CommPortIdentifier)enume.nextElement();
+ //if (portID.getPortType() == CommPortIdentifier.PORT_SERIAL)
+ retVal.add(portID.getName());
+ }
+ }
+ catch(Exception ex)
+ {
+ System.out.println("Exception: getAvailableSerialPorts: " + ex);
+
+ }
+ return retVal;
+
+ }
+
+
@SuppressWarnings("unchecked")
public static Vector<CommPortIdentifier> getAllAvailablePorts()
{
Property changes on: trunk/ggc-pump
___________________________________________________________________
Modified: svn:ignore
- bin
+ bin
test
Modified: trunk/ggc-pump/.classpath
===================================================================
--- trunk/ggc-pump/.classpath 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/.classpath 2008-08-24 14:22:06 UTC (rev 502)
@@ -3,11 +3,11 @@
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/Atech-Tools"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.1.7-a1"/>
<classpathentry combineaccessrules="false" kind="src" path="/GGC Plugin Base"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/ggc-pump/src/ggc/core/db/hibernate/DayValueH.java
===================================================================
--- trunk/ggc-pump/src/ggc/core/db/hibernate/DayValueH.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/core/db/hibernate/DayValueH.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -8,6 +8,8 @@
/** @author Hibernate CodeGenerator */
public class DayValueH implements Serializable {
+ private static final long serialVersionUID = -1661031856854546844L;
+
/** identifier field */
private long id;
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpValuesTableModel.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpValuesTableModel.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpValuesTableModel.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -42,6 +42,8 @@
// GlucoValueEventListener
{
+ private static final long serialVersionUID = -3199123443953228082L;
+
private I18nControl m_ic = I18nControl.getInstance();
// x private DataAccessMeter m_da = DataAccessMeter.getInstance();
Modified: trunk/ggc-pump/src/ggc/pump/device/PumpException.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/PumpException.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/device/PumpException.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -5,6 +5,8 @@
{
+ private static final long serialVersionUID = -2859706316077380716L;
+
/**
* Constructor for ImportException.
*/
Modified: trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -236,6 +236,7 @@
}
+ @SuppressWarnings("unused")
private ArrayList<PumpValuesEntry> getBoluses()
{
return getSpecificElements("BOLUS", AccuChekSmartPixPump.TAG_BOLUS);
@@ -249,6 +250,7 @@
+ @SuppressWarnings("unused")
private ArrayList<PumpValuesEntry> getEvents()
{
return getSpecificElements("EVENT", AccuChekSmartPixPump.TAG_EVENT);
Modified: trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/device/animas/EZManagerDb.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -24,6 +24,7 @@
//private OutputWriter m_writer;
+ @SuppressWarnings("unused")
private String m_fileName;
Modified: trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedCareLinkData.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedCareLinkData.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/device/minimed/MinimedCareLinkData.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -10,8 +10,11 @@
private String time; // 2
private String raw_type; // 33
private String raw_values; // 34
+ @SuppressWarnings("unused")
private String raw_id; // 35
+ @SuppressWarnings("unused")
private String raw_upload_id; // 36
+ @SuppressWarnings("unused")
private String raw_seq_num; // 37
private String raw_device_type; // 38
Modified: trunk/ggc-pump/src/ggc/pump/gui/PumpDisplayDataDialog.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/PumpDisplayDataDialog.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/gui/PumpDisplayDataDialog.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -47,6 +47,8 @@
// private JLabel infoIcon = null;
// x private JLabel infoDescription = null;
+ private static final long serialVersionUID = 8849188103070838842L;
+
PumpReaderRunner mrr;
private DataAccessPump m_da = DataAccessPump.getInstance();
Modified: trunk/ggc-pump/src/ggc/pump/gui/config/SimpleConfigurationHelp.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/config/SimpleConfigurationHelp.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/gui/config/SimpleConfigurationHelp.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -48,6 +48,7 @@
public class SimpleConfigurationHelp extends JDialog implements ActionListener
{
+ private static final long serialVersionUID = -7736163052250034544L;
private I18nControl m_ic = I18nControl.getInstance();
private DataAccessPump m_da; // = DataAccessMeter.getInstance();
Modified: trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2008-08-23 19:42:54 UTC (rev 501)
+++ trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2008-08-24 14:22:06 UTC (rev 502)
@@ -373,9 +373,9 @@
this.timeZones.put("(GMT-04:00) Caracas, La Paz", "America/Caracas");
this.timeZones.put("(GMT-04:00) Santiago", "America/Santiago");
this.timeZones.put("(GMT-05:00) Bogota, Lima, Quito", "America/Bogota");
- this.timeZones.put("(GMT-05:00) Eastern Time (US & Canada)", " America/New_York");
- this.timeZones.put("(GMT-05:00) Indiana (East)", "America/Indianapolis");
- this.timeZones.put("(GMT-06:00) Central America", "America/Costa_Rica");
+ this.timeZones.put("(GMT-05:00) Eastern Time (US & Canada)", " America/New_York");
+ this.timeZones.put("(GMT-05:00) Indiana (East)", "America/Indianapolis");
+ this.timeZones.put("(GMT-06:00) Central America", "America/Costa_Rica");
this.timeZones.put("(GMT-06:00) Central Time (US & Canada)", "America/Chicago");
this.timeZones.put("(GMT-06:00) Guadalajara, Mexico City, Monterrey", "America/Mexico_City");
this.timeZones.put("(GMT-06:00) Saskatchewan", "America/Winnipeg");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
