Menu
▾
▴
ggc-cvs
|
From: <and...@us...> - 2016-09-13 20:02:39
|
Revision: 1410
http://sourceforge.net/p/ggc/code/1410
Author: andyrozman
Date: 2016-09-13 20:02:38 +0000 (Tue, 13 Sep 2016)
Log Message:
-----------
- final changed files to 0.7.0
Modified Paths:
--------------
trunk/ggc-desktop/data/update/GGC_Update.properties
trunk/ggc-support/doc/deployment/createFullDependencies.sh
trunk/ggc-support/doc/deployment/deployment-HowTo.txt
trunk/pom.xml
trunk/web_page/inc_download.inc
trunk/web_page/inc_news.inc
Modified: trunk/ggc-desktop/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc-desktop/data/update/GGC_Update.properties 2016-06-30 20:30:13 UTC (rev 1409)
+++ trunk/ggc-desktop/data/update/GGC_Update.properties 2016-09-13 20:02:38 UTC (rev 1410)
@@ -66,7 +66,7 @@
#
# Components
#
-LAST_COMPONENT=31
+LAST_COMPONENT=32
#
@@ -317,6 +317,14 @@
COMPONENT_31_ROOT_DIR=/lib/utils
COMPONENT_31_FILES=%ROOT%/table-layout-4.3.0.jar;
+
+COMPONENT_32_GROUP=3
+COMPONENT_32_NAME=Simple Xml Framework
+COMPONENT_32_VERSION=2.7.1
+COMPONENT_32_VERSION_NUM=1
+COMPONENT_32_ROOT_DIR=/lib/utils
+COMPONENT_32_FILES=%ROOT%/simple-xml-2.7.1.jar;
+
# REMOVED COMPONENTS
COMPONENT_4_GROUP=1
Modified: trunk/ggc-support/doc/deployment/createFullDependencies.sh
===================================================================
--- trunk/ggc-support/doc/deployment/createFullDependencies.sh 2016-06-30 20:30:13 UTC (rev 1409)
+++ trunk/ggc-support/doc/deployment/createFullDependencies.sh 2016-09-13 20:02:38 UTC (rev 1410)
@@ -1,7 +1,7 @@
#!/bin/sh
-export GGC_VERSION=0.6
-export GGC_DEPLOY_TARGET=/mnt/d/GGC/deploy
+export GGC_VERSION=0.7
+export GGC_DEPLOY_TARGET=/u01/GGC/deploy
export GGC_ROOT=/home/andy/workspaces/andy-iplayground4/ggc
@@ -21,30 +21,30 @@
cd dependencies
echo ... GGC Core
-cp $GGC_ROOT/ggc-core/target/dependency/*.* .
+cp -R $GGC_ROOT/ggc-core/target/dependency/* .
echo ... GGC Plugin Base
-cp $GGC_ROOT/ggc-plugin_base/target/dependency/*.* .
+cp -R $GGC_ROOT/ggc-plugin_base/target/dependency/* .
echo ... GGC Nutrition
-cp $GGC_ROOT/ggc-nutri/target/dependency/*.* .
+cp -R $GGC_ROOT/ggc-nutri/target/dependency/* .
echo ... GGC Help
-cp $GGC_ROOT/ggc-help/target/dependency/*.* .
+cp -R $GGC_ROOT/ggc-help/target/dependency/* .
echo ... GGC Meter Plugin
-cp $GGC_ROOT/ggc-meter/target/dependency/*.* .
+cp -R $GGC_ROOT/ggc-meter/target/dependency/* .
echo ... GGC Pump Plugin
-cp $GGC_ROOT/ggc-pump/target/dependency/*.* .
+cp -R $GGC_ROOT/ggc-pump/target/dependency/* .
echo ... GGC CGMS Plugin
-cp $GGC_ROOT/ggc-cgm/target/dependency/*.* .
+cp -R $GGC_ROOT/ggc-cgm/target/dependency/* .
echo ... GGC Desktop
-cp $GGC_ROOT/ggc-desktop/target/dependency/*.* .
+cp -R $GGC_ROOT/ggc-desktop/target/dependency/* .
+cp $GGC_ROOT/ggc-desktop/target/*.jar .
-
cd ..
@@ -76,6 +76,7 @@
echo ... GGC Desktop
cp -R $GGC_ROOT/ggc-desktop/target/dependency/* .
+cp $GGC_ROOT/ggc-desktop/target/*.jar .
@@ -121,5 +122,41 @@
mkdir core
cp $GGC_ROOT/ggc-core/docs/* ./core/.
+cd ..
+
+
+echo Create app
+mkdir app
+cd app
+
+echo ... GGC Core
+cp $GGC_ROOT/ggc-core/target/*.jar .
+
+echo ... GGC Plugin Base
+cp $GGC_ROOT/ggc-plugin_base/target/*.jar .
+
+echo ... GGC Nutrition
+cp $GGC_ROOT/ggc-nutri/target/*.jar .
+
+echo ... GGC Help
+cp $GGC_ROOT/ggc-help/target/*.jar .
+
+echo ... GGC Meter Plugin
+cp $GGC_ROOT/ggc-meter/target/*.jar .
+
+echo ... GGC Pump Plugin
+cp $GGC_ROOT/ggc-pump/target/*.jar .
+
+echo ... GGC CGMS Plugin
+cp $GGC_ROOT/ggc-cgm/target/*.jar .
+
+echo ... GGC Desktop
+cp $GGC_ROOT/ggc-desktop/target/*.jar .
+
+
+cd ..
+cd ..
+
+
echo All preparation for GGC deployment finished.
Modified: trunk/ggc-support/doc/deployment/deployment-HowTo.txt
===================================================================
--- trunk/ggc-support/doc/deployment/deployment-HowTo.txt 2016-06-30 20:30:13 UTC (rev 1409)
+++ trunk/ggc-support/doc/deployment/deployment-HowTo.txt 2016-09-13 20:02:38 UTC (rev 1410)
@@ -19,6 +19,8 @@
4. Compare new dependencies to old one (previous release) and copy them to target deployment directory and
prepare new GGCUpdate.properties configuration.
+4.a) Copy .m2 respository difference to atech-software.com:
+ scp -P 12488 repository_diff.tar.bz2 andy@188.40.149.16:~/
5. Sort copied documentation from step 3
@@ -63,8 +65,9 @@
svn copy svn+ssh://and...@sv.../p/ggc/code/trunk \
svn+ssh://and...@sv.../p/ggc/code/tags/0.6.0 -m "GGC 0.6.0"
+svn copy svn+ssh://and...@sv.../p/atech-tools/code/trunk \
+ svn+ssh://and...@sv.../p/atech-tools/code/tags/0.7.13 -m "Atech Tools 0.7.13 for GGC 0.6.1"
-
--- Useful commands
A) Create dependency tree
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2016-06-30 20:30:13 UTC (rev 1409)
+++ trunk/pom.xml 2016-09-13 20:02:38 UTC (rev 1410)
@@ -22,8 +22,8 @@
<module>ggc-plugin_base</module>
<module>ggc-nutri</module>
<module>ggc-meter</module>
+ <module>ggc-cgm</module>
<module>ggc-pump</module>
- <module>ggc-cgm</module>
<module>ggc-desktop</module>
</modules>
Modified: trunk/web_page/inc_download.inc
===================================================================
--- trunk/web_page/inc_download.inc 2016-06-30 20:30:13 UTC (rev 1409)
+++ trunk/web_page/inc_download.inc 2016-09-13 20:02:38 UTC (rev 1410)
@@ -48,12 +48,20 @@
<h3>GGC Releases</h3>
- <h4>Version 0.7.0 [June 2016]</h4>
+ <h4>Version 0.7.0 [June 2016 (Windows inst. added on September 2016)]</h4>
<ul>
- <li><b>I am sorry but I couldn't make windows installer this time.</b></li>
+ <li>
+ <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_Setup_0.7.0_jre.exe/download">
+ GGC 0.7.0 - Windows Installer with Java [Preferred for Windows users]</a>
+ </li>
<li>
+ <a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_Setup_0.7.0.exe/download">
+ GGC 0.7.0 - Windows Installer without Java</a>
+ </li>
+
+ <li>
<a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_0.7.0.zip/download">GGC
0.7.0 (Full) Zip file</a>
</li>
@@ -62,6 +70,7 @@
<a href="http://sourceforge.net/projects/ggc/files/GNU%20Gluco%20Control/GGC%200.7.0/GGC_Update_0.7.0.zip/download">GGC
0.7.0 Update Zip file</a>
</li>
+ </ul>
<h4>Version 0.6.1 [October 2015]</h4>
Modified: trunk/web_page/inc_news.inc
===================================================================
--- trunk/web_page/inc_news.inc 2016-06-30 20:30:13 UTC (rev 1409)
+++ trunk/web_page/inc_news.inc 2016-09-13 20:02:38 UTC (rev 1410)
@@ -19,14 +19,14 @@
correctly. I just got news that it might not work anymore on never Linux (it seems that USB 3.0 support
broke support for Carelink USB).<br>
Changes in this version:<br>
- - I changed menus a little, different grouping
- - added graphs from Pen to Pump (this is still work in progress, but at least some things should be working)
- - added/changed reports, they now contain also CGMS data (Daily Time Sheet report for Pump)
- - added some daily/weekly graphs for CGMS
+ - I changed menus a little, different grouping<br>
+ - added graphs from Pen to Pump (this is still work in progress, but at least some things should be working)<br>
+ - added/changed reports, they now contain also CGMS data (Daily Time Sheet report for Pump)<br>
+ - added some daily/weekly graphs for CGMS<br>
- minor change for Contour USB meters (it seems that library we are using has a bug, so reading of data
- takes a long time (about 2 min for all entries)... We are looking to remedy the problem ASAP).
+ takes a long time (about 2 min for all entries)... We are looking to remedy the problem ASAP).<br>
We added development version
- of library to our project, so that we can test this and possibly find a solution in near future.
+ of library to our project, so that we can test this and possibly find a solution in near future.<br>
<br>
If you find some problems please report and I will try to make a fix release if needed.<br>
<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 11:30:19
|
Revision: 1412
http://sourceforge.net/p/ggc/code/1412
Author: andyrozman
Date: 2016-12-25 11:30:16 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
- added ggc-removed to tree
- moved ggc-mobile
- moved ggc-ppc
Modified Paths:
--------------
trunk/ggc-removed/ggc-mobile/build/build.xml
Added Paths:
-----------
trunk/ggc-removed/
trunk/ggc-removed/ggc-mobile/
trunk/ggc-removed/ggc-ppc/
Removed Paths:
-------------
trunk/ggc-mobile/
trunk/ggc-ppc/
Modified: trunk/ggc-removed/ggc-mobile/build/build.xml
===================================================================
--- trunk/ggc-mobile/build/build.xml 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-removed/ggc-mobile/build/build.xml 2016-12-25 11:30:16 UTC (rev 1412)
@@ -1,12 +1,12 @@
<?xml version="1.0" ?>
-<project name="GGC Mobile" default="build" basedir=".">
+<project name="GGC Mobile" default="build" basedir="">
<description>
Build file for GGC
</description>
<!-- Environment properties read from a file ...-->
- <property file="./GGCMobileBuild.properties"/>
- <property file="./GGCMobileVersion.properties"/>
+ <property file="GGCMobileBuild.properties"/>
+ <property file="GGCMobileVersion.properties"/>
<!-- These should *not* be modified on the command line! -->
<property name="build.dir" value="${outdir.dir}/classes"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 11:47:39
|
Revision: 1413
http://sourceforge.net/p/ggc/code/1413
Author: andyrozman
Date: 2016-12-25 11:47:37 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Support
- added new project
- moved ggc-help here
Added Paths:
-----------
trunk/ggc-support/ggc-support/
trunk/ggc-support/ggc-support/data/
trunk/ggc-support/ggc-support/developers/
trunk/ggc-support/ggc-support/doc/
trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh
trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt
trunk/ggc-support/ggc-support/eclipse/
trunk/ggc-support/ggc-support/lib/
trunk/ggc-support/pom.xml
Removed Paths:
-------------
trunk/ggc-help/pom.xml
trunk/ggc-support/data/
trunk/ggc-support/developers/
trunk/ggc-support/doc/
trunk/ggc-support/eclipse/
trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh
trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt
trunk/ggc-support/lib/
Deleted: trunk/ggc-help/pom.xml
===================================================================
--- trunk/ggc-help/pom.xml 2016-12-25 11:30:16 UTC (rev 1412)
+++ trunk/ggc-help/pom.xml 2016-12-25 11:47:37 UTC (rev 1413)
@@ -1,48 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
- </parent>
-
- <name>GGC Help Project</name>
-
- <artifactId>ggc-help</artifactId>
- <version>${ggc-help.version}</version>
-
-
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src/main/java</sourceDirectory>
- <scriptSourceDirectory>src/main/resources</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- </dependency>
- </dependencies>
-</project>
Deleted: trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh
===================================================================
--- trunk/ggc-support/doc/deployment/createFullDependencies.sh 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh 2016-12-25 11:47:37 UTC (rev 1413)
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-export GGC_VERSION=0.6
-export GGC_DEPLOY_TARGET=/mnt/d/GGC/deploy
-export GGC_ROOT=/home/andy/workspaces/andy-iplayground4/ggc
-
-
-
-
-echo Prepare target directory
-
-cd $GGC_DEPLOY_TARGET
-
-rm -Rf $GGC_VERSION
-
-mkdir $GGC_VERSION
-cd $GGC_VERSION
-
-echo Copy dependencies
-mkdir dependencies
-cd dependencies
-
-echo ... GGC Core
-cp $GGC_ROOT/ggc-core/target/dependency/*.* .
-
-echo ... GGC Plugin Base
-cp $GGC_ROOT/ggc-plugin_base/target/dependency/*.* .
-
-echo ... GGC Nutrition
-cp $GGC_ROOT/ggc-nutri/target/dependency/*.* .
-
-echo ... GGC Help
-cp $GGC_ROOT/ggc-help/target/dependency/*.* .
-
-echo ... GGC Meter Plugin
-cp $GGC_ROOT/ggc-meter/target/dependency/*.* .
-
-echo ... GGC Pump Plugin
-cp $GGC_ROOT/ggc-pump/target/dependency/*.* .
-
-echo ... GGC CGMS Plugin
-cp $GGC_ROOT/ggc-cgm/target/dependency/*.* .
-
-echo ... GGC Desktop
-cp $GGC_ROOT/ggc-desktop/target/dependency/*.* .
-
-
-cd ..
-
-
-echo Create repository
-
-mkdir repository
-cd repository
-
-echo ... GGC Core
-cp -R $GGC_ROOT/ggc-core/target/dependency/* .
-
-echo ... GGC Plugin Base
-cp -R $GGC_ROOT/ggc-plugin_base/target/dependency/* .
-
-echo ... GGC Nutrition
-cp -R $GGC_ROOT/ggc-nutri/target/dependency/* .
-
-echo ... GGC Help
-cp -R $GGC_ROOT/ggc-help/target/dependency/* .
-
-echo ... GGC Meter Plugin
-cp -R $GGC_ROOT/ggc-meter/target/dependency/* .
-
-echo ... GGC Pump Plugin
-cp -R $GGC_ROOT/ggc-pump/target/dependency/* .
-
-echo ... GGC CGMS Plugin
-cp -R $GGC_ROOT/ggc-cgm/target/dependency/* .
-
-echo ... GGC Desktop
-cp -R $GGC_ROOT/ggc-desktop/target/dependency/* .
-
-
-
-cd ..
-
-
-
-
-echo Copy documentation - this is done dinamically and sometime statically, check if you added any new docs
-
-mkdir documentation
-cd documentation
-
-echo ... GGC Desktop
-cp -R $GGC_ROOT/ggc-desktop/doc/* .
-
-echo ... GGC Plugin Base
-mkdir tools-base
-cp $GGC_ROOT/ggc-plugin_base/docs/* ./tools-base/.
-
-echo ... GGC Nutrition
-mkdir plugin-nutrition
-cp $GGC_ROOT/ggc-nutri/docs/* ./plugin-nutrition/.
-
-echo ... GGC Help
-mkdir help
-cp $GGC_ROOT/ggc-help/docs/* ./help/.
-
-echo ... GGC Meter Plugin
-mkdir plugin-meter
-cp $GGC_ROOT/ggc-meter/docs/* ./plugin-meter/.
-
-echo ... GGC Pump Plugin
-mkdir plugin-pump
-cp $GGC_ROOT/ggc-pump/docs/* ./plugin-pump/.
-
-
-echo ... GGC CGMS Plugin
-mkdir plugin-cgms
-cp $GGC_ROOT/ggc-cgm/doc/* ./plugin-cgms/.
-
-echo ... GGC Core
-mkdir core
-cp $GGC_ROOT/ggc-core/docs/* ./core/.
-
-echo All preparation for GGC deployment finished.
-
Copied: trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh (from rev 1410, trunk/ggc-support/doc/deployment/createFullDependencies.sh)
===================================================================
--- trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh (rev 0)
+++ trunk/ggc-support/ggc-support/doc/deployment/createFullDependencies.sh 2016-12-25 11:47:37 UTC (rev 1413)
@@ -0,0 +1,162 @@
+#!/bin/sh
+
+export GGC_VERSION=0.7
+export GGC_DEPLOY_TARGET=/u01/GGC/deploy
+export GGC_ROOT=/home/andy/workspaces/andy-iplayground4/ggc
+
+
+
+
+echo Prepare target directory
+
+cd $GGC_DEPLOY_TARGET
+
+rm -Rf $GGC_VERSION
+
+mkdir $GGC_VERSION
+cd $GGC_VERSION
+
+echo Copy dependencies
+mkdir dependencies
+cd dependencies
+
+echo ... GGC Core
+cp -R $GGC_ROOT/ggc-core/target/dependency/* .
+
+echo ... GGC Plugin Base
+cp -R $GGC_ROOT/ggc-plugin_base/target/dependency/* .
+
+echo ... GGC Nutrition
+cp -R $GGC_ROOT/ggc-nutri/target/dependency/* .
+
+echo ... GGC Help
+cp -R $GGC_ROOT/ggc-help/target/dependency/* .
+
+echo ... GGC Meter Plugin
+cp -R $GGC_ROOT/ggc-meter/target/dependency/* .
+
+echo ... GGC Pump Plugin
+cp -R $GGC_ROOT/ggc-pump/target/dependency/* .
+
+echo ... GGC CGMS Plugin
+cp -R $GGC_ROOT/ggc-cgm/target/dependency/* .
+
+echo ... GGC Desktop
+cp -R $GGC_ROOT/ggc-desktop/target/dependency/* .
+cp $GGC_ROOT/ggc-desktop/target/*.jar .
+
+cd ..
+
+
+echo Create repository
+
+mkdir repository
+cd repository
+
+echo ... GGC Core
+cp -R $GGC_ROOT/ggc-core/target/dependency/* .
+
+echo ... GGC Plugin Base
+cp -R $GGC_ROOT/ggc-plugin_base/target/dependency/* .
+
+echo ... GGC Nutrition
+cp -R $GGC_ROOT/ggc-nutri/target/dependency/* .
+
+echo ... GGC Help
+cp -R $GGC_ROOT/ggc-help/target/dependency/* .
+
+echo ... GGC Meter Plugin
+cp -R $GGC_ROOT/ggc-meter/target/dependency/* .
+
+echo ... GGC Pump Plugin
+cp -R $GGC_ROOT/ggc-pump/target/dependency/* .
+
+echo ... GGC CGMS Plugin
+cp -R $GGC_ROOT/ggc-cgm/target/dependency/* .
+
+echo ... GGC Desktop
+cp -R $GGC_ROOT/ggc-desktop/target/dependency/* .
+cp $GGC_ROOT/ggc-desktop/target/*.jar .
+
+
+
+cd ..
+
+
+
+
+echo Copy documentation - this is done dinamically and sometime statically, check if you added any new docs
+
+mkdir documentation
+cd documentation
+
+echo ... GGC Desktop
+cp -R $GGC_ROOT/ggc-desktop/doc/* .
+
+echo ... GGC Plugin Base
+mkdir tools-base
+cp $GGC_ROOT/ggc-plugin_base/docs/* ./tools-base/.
+
+echo ... GGC Nutrition
+mkdir plugin-nutrition
+cp $GGC_ROOT/ggc-nutri/docs/* ./plugin-nutrition/.
+
+echo ... GGC Help
+mkdir help
+cp $GGC_ROOT/ggc-help/docs/* ./help/.
+
+echo ... GGC Meter Plugin
+mkdir plugin-meter
+cp $GGC_ROOT/ggc-meter/docs/* ./plugin-meter/.
+
+echo ... GGC Pump Plugin
+mkdir plugin-pump
+cp $GGC_ROOT/ggc-pump/docs/* ./plugin-pump/.
+
+
+echo ... GGC CGMS Plugin
+mkdir plugin-cgms
+cp $GGC_ROOT/ggc-cgm/doc/* ./plugin-cgms/.
+
+echo ... GGC Core
+mkdir core
+cp $GGC_ROOT/ggc-core/docs/* ./core/.
+
+cd ..
+
+
+echo Create app
+mkdir app
+cd app
+
+echo ... GGC Core
+cp $GGC_ROOT/ggc-core/target/*.jar .
+
+echo ... GGC Plugin Base
+cp $GGC_ROOT/ggc-plugin_base/target/*.jar .
+
+echo ... GGC Nutrition
+cp $GGC_ROOT/ggc-nutri/target/*.jar .
+
+echo ... GGC Help
+cp $GGC_ROOT/ggc-help/target/*.jar .
+
+echo ... GGC Meter Plugin
+cp $GGC_ROOT/ggc-meter/target/*.jar .
+
+echo ... GGC Pump Plugin
+cp $GGC_ROOT/ggc-pump/target/*.jar .
+
+echo ... GGC CGMS Plugin
+cp $GGC_ROOT/ggc-cgm/target/*.jar .
+
+echo ... GGC Desktop
+cp $GGC_ROOT/ggc-desktop/target/*.jar .
+
+
+cd ..
+cd ..
+
+
+echo All preparation for GGC deployment finished.
+
Deleted: trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt
===================================================================
--- trunk/ggc-support/doc/deployment/deployment-HowTo.txt 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt 2016-12-25 11:47:37 UTC (rev 1413)
@@ -1,73 +0,0 @@
-
-DEPLOYMENT PROCESS (WITH MAVEN)
-
-
-1. Make full build:
-mvn clean install in root
-
-
-2. Make dependencies build:
-a.) mvn dependency:copy-dependencies
-b.) mvn dependency:copy-dependencies "-Dmdep.useRepositoryLayout=true" "-DcopyPom=true"
-
-mvn dependency:copy-dependencies -Dmdep.useRepositoryLayout=true -DcopyPom=true
-
-
-3. Copy createFullDependencies.sh to ggc root and run it. It will copy all dependencies from all projects into
- specified (in .sh) directory. This will also copy together all documentation.
-
-
-4. Compare new dependencies to old one (previous release) and copy them to target deployment directory and
- prepare new GGCUpdate.properties configuration.
-
-
-5. Sort copied documentation from step 3
-
-
-6. Make final deployment artifacts:
- - zip deployment of project (GGC-<version>.zip)
- - copy all files to windows build environent and create Windows installer
- - create update zip (update from 0.3.0 version)
-
-
-7. Send mail to all testers (GGC Testers list) with link to new version.
-
---- WAIT 2 weeks and fix problems, start again with step 1 and then skip step 7 or give software for retest
-
-
-
-8. Prepare entries for Update Server (xml of GGCUpdate, copy update zip)
-
-
-9. Prepare Web page
-
-
-10. Release deployment files to sf.net and deploy web page
-
-
-a)
-
-b)
-sftp jsmith,foo...@fr...
-cd htdocs
-put <files>
-
-
-
-11. Deploy some documentation to Website if required
-
-
-
-12. Tag released version in SVN
-
-svn copy svn+ssh://and...@sv.../p/ggc/code/trunk \
- svn+ssh://and...@sv.../p/ggc/code/tags/0.6.0 -m "GGC 0.6.0"
-
-
-
---- Useful commands
-
-A) Create dependency tree
-
- mvn dependency:tree > deps.txt
-
Copied: trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt (from rev 1410, trunk/ggc-support/doc/deployment/deployment-HowTo.txt)
===================================================================
--- trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt (rev 0)
+++ trunk/ggc-support/ggc-support/doc/deployment/deployment-HowTo.txt 2016-12-25 11:47:37 UTC (rev 1413)
@@ -0,0 +1,76 @@
+
+DEPLOYMENT PROCESS (WITH MAVEN)
+
+
+1. Make full build:
+mvn clean install in root
+
+
+2. Make dependencies build:
+a.) mvn dependency:copy-dependencies
+b.) mvn dependency:copy-dependencies "-Dmdep.useRepositoryLayout=true" "-DcopyPom=true"
+
+mvn dependency:copy-dependencies -Dmdep.useRepositoryLayout=true -DcopyPom=true
+
+
+3. Copy createFullDependencies.sh to ggc root and run it. It will copy all dependencies from all projects into
+ specified (in .sh) directory. This will also copy together all documentation.
+
+
+4. Compare new dependencies to old one (previous release) and copy them to target deployment directory and
+ prepare new GGCUpdate.properties configuration.
+4.a) Copy .m2 respository difference to atech-software.com:
+ scp -P 12488 repository_diff.tar.bz2 andy@188.40.149.16:~/
+
+
+5. Sort copied documentation from step 3
+
+
+6. Make final deployment artifacts:
+ - zip deployment of project (GGC-<version>.zip)
+ - copy all files to windows build environent and create Windows installer
+ - create update zip (update from 0.3.0 version)
+
+
+7. Send mail to all testers (GGC Testers list) with link to new version.
+
+--- WAIT 2 weeks and fix problems, start again with step 1 and then skip step 7 or give software for retest
+
+
+
+8. Prepare entries for Update Server (xml of GGCUpdate, copy update zip)
+
+
+9. Prepare Web page
+
+
+10. Release deployment files to sf.net and deploy web page
+
+
+a)
+
+b)
+sftp jsmith,foo...@fr...
+cd htdocs
+put <files>
+
+
+
+11. Deploy some documentation to Website if required
+
+
+
+12. Tag released version in SVN
+
+svn copy svn+ssh://and...@sv.../p/ggc/code/trunk \
+ svn+ssh://and...@sv.../p/ggc/code/tags/0.6.0 -m "GGC 0.6.0"
+
+svn copy svn+ssh://and...@sv.../p/atech-tools/code/trunk \
+ svn+ssh://and...@sv.../p/atech-tools/code/tags/0.7.13 -m "Atech Tools 0.7.13 for GGC 0.6.1"
+
+--- Useful commands
+
+A) Create dependency tree
+
+ mvn dependency:tree > deps.txt
+
Copied: trunk/ggc-support/pom.xml (from rev 1367, trunk/ggc-help/pom.xml)
===================================================================
--- trunk/ggc-support/pom.xml (rev 0)
+++ trunk/ggc-support/pom.xml 2016-12-25 11:47:37 UTC (rev 1413)
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ </parent>
+
+ <name>GGC Support</name>
+ <artifactId>support</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <modules>
+ <module>ggc-help</module>
+ </modules>
+
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 11:49:57
|
Revision: 1414
http://sourceforge.net/p/ggc/code/1414
Author: andyrozman
Date: 2016-12-25 11:49:54 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Support
- added new project
- moved ggc-help here
Added Paths:
-----------
trunk/ggc-support/ggc-help/
trunk/ggc-support/ggc-help/docs/Changelog.txt
trunk/ggc-support/ggc-help/docs/HelpFiles.ods
trunk/ggc-support/ggc-help/docs/HelpSupportInGGC.doc
trunk/ggc-support/ggc-help/pom.xml
trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml
trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html
trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html
Removed Paths:
-------------
trunk/ggc-help/
trunk/ggc-support/ggc-help/docs/Changelog.txt
trunk/ggc-support/ggc-help/docs/HelpSupportInGGC.doc
trunk/ggc-support/ggc-help/pom.xml
trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml
trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm
Deleted: trunk/ggc-support/ggc-help/docs/Changelog.txt
===================================================================
--- trunk/ggc-help/docs/Changelog.txt 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-help/docs/Changelog.txt 2016-12-25 11:49:54 UTC (rev 1414)
@@ -1,8 +0,0 @@
-
-Changelog for GGC Help (Help for GGC)
-=====================================
-
-0.2 [26.4.2015]
- * Inital version in this format. Before this was in ggc-lang.jar, now there is no ggc-lang anymore
- and instead we have this separate module just for help
- * Added documentation for Help
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/docs/Changelog.txt (from rev 1397, trunk/ggc-help/docs/Changelog.txt)
===================================================================
--- trunk/ggc-support/ggc-help/docs/Changelog.txt (rev 0)
+++ trunk/ggc-support/ggc-help/docs/Changelog.txt 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,18 @@
+
+Changelog for GGC Help (Help for GGC)
+=====================================
+
+0.2.2 [18.5.2016] [Andy]
+- added pages for Doctors module (WIP)
+- added pages for Graph_CGMS
+
+
+0.2.1
+ * added some pages that were missing and preparing document for Bob (person who will probably prepare GGC Help)
+ * added pages to en
+
+
+0.2 [26.4.2015]
+ * Inital version in this format. Before this was in ggc-lang.jar, now there is no ggc-lang anymore
+ and instead we have this separate module just for help
+ * Added documentation for Help
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/docs/HelpFiles.ods (from rev 1397, trunk/ggc-help/docs/HelpFiles.ods)
===================================================================
(Binary files differ)
Deleted: trunk/ggc-support/ggc-help/docs/HelpSupportInGGC.doc
===================================================================
(Binary files differ)
Copied: trunk/ggc-support/ggc-help/docs/HelpSupportInGGC.doc (from rev 1397, trunk/ggc-help/docs/HelpSupportInGGC.doc)
===================================================================
(Binary files differ)
Deleted: trunk/ggc-support/ggc-help/pom.xml
===================================================================
--- trunk/ggc-help/pom.xml 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-help/pom.xml 2016-12-25 11:49:54 UTC (rev 1414)
@@ -1,55 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
- </parent>
-
- <name>GGC Help Project</name>
-
- <artifactId>ggc-help</artifactId>
- <version>${ggc-help.version}</version>
-
-
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src/main/java</sourceDirectory>
- <scriptSourceDirectory>src/main/resources</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- </dependency>
-
- </dependencies>
-</project>
Copied: trunk/ggc-support/ggc-help/pom.xml (from rev 1368, trunk/ggc-help/pom.xml)
===================================================================
--- trunk/ggc-support/ggc-help/pom.xml (rev 0)
+++ trunk/ggc-support/ggc-help/pom.xml 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ </parent>
+
+ <name>GGC Help Project</name>
+
+ <artifactId>ggc-help</artifactId>
+ <version>${ggc-help.version}</version>
+
+
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/resources</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Deleted: trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml
===================================================================
--- trunk/ggc-help/src/main/resources/help/en/GGCTOC.xml 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml 2016-12-25 11:49:54 UTC (rev 1414)
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net-->
-
-<toc version="1.0">
- <tocitem text="GGC Help " target="GGC_Main">
- <tocitem text="File ">
- <tocitem text="Login " target="GGC_File_Login"/>
- <tocitem text="Logout " target="GGC_File_Logout"/>
- </tocitem>
-
- <tocitem text="Pen/Injection">
-
- <tocitem text="Daily ">
- <tocitem text="Daily Entries View" target="GGC_BG_Daily_View"/>
- <tocitem text="Daily Entries Add" target="GGC_BG_Daily_Add"/>
- <tocitem text="Bolus Helper" target="GGC_PenInj_BolusHelper"/>
- <tocitem text="Meals, Foods Selector" target="GGC_MFS_Daily_Selector"/>
- <tocitem text="Meals, Foods Parts Selector" target="GGC_MFS_Item_Selector"/>
- <tocitem text="Food by Description" target="GGC_Tools_FoodDescription"/>
- </tocitem>
-
- <tocitem text="Graph ">
- <tocitem text="Course Graph" target="GGC_BG_Graph_Course"/>
- <tocitem text="Spread Graph" target="GGC_BG_Graph_Spread"/>
- <tocitem text="Frequency Graph" target="GGC_BG_Graph_Frequency"/>
- </tocitem>
-
- <tocitem text="HbA1c ">
- <tocitem text="HbA1c View" target="GGC_BG_HbA1c"/>
- </tocitem>
-
- <tocitem text="Ratio ">
- <tocitem text="Base Ratio" target="GGC_Ratio_Base"/>
- <tocitem text="Extended Ratio" target="GGC_Ratio_Extended"/>
- <tocitem text="Ratio Calculator" target="GGC_Ratio_Calculator"/>
- </tocitem>
- </tocitem>
-
- <tocitem text="Food ">
- <tocitem text="USDA Database ">
- <tocitem text="Main " target="GGC_Food_USDA_Main"/>
- <tocitem text="Group View " target="GGC_Food_USDA_Group"/>
- <tocitem text="Food View " target="GGC_Food_USDA_View"/>
- </tocitem>
-
- <tocitem text="User Database ">
- <tocitem text="Main " target="GGC_Food_User_Main"/>
- <tocitem text="Food Add/Edit " target="GGC_Food_User_Food_Edit"/>
- <tocitem text="Food View " target="GGC_Food_User_Food_View"/>
- <tocitem text="Group Add/Edit " target="GGC_Food_User_Group_Edit"/>
- <tocitem text="Group View " target="GGC_Food_User_Group_View"/>
- <tocitem text="Nutrition Selector Main " target="GGC_Food_User_Select_Nutrition_Main"/>
- <tocitem text="Nutrition Selector " target="GGC_Food_User_Select_Nutrition"/>
- <tocitem text="Home Weight Selector Main " target="GGC_Food_User_Select_HomeWeight_Main"/>
- <tocitem text="Home Weight Selector " target="GGC_Food_User_Select_HomeWeight"/>
- </tocitem>
-
- <tocitem text="Meals Database ">
- <tocitem text="Main " target="GGC_Food_Meal_Main"/>
- <tocitem text="Group Add/Edit " target="GGC_Food_Meal_Group_Edit"/>
- <tocitem text="Group View " target="GGC_Food_Meal_Group_View"/>
- <tocitem text="Meal Add/Edit " target="GGC_Food_Meal_Meal_Edit"/>
- <tocitem text="Meal View " target="GGC_Food_Meal_Meal_View"/>
- <tocitem text="Food Parts Selector " target="GGC_Food_Meal_Select_FoodParts"/>
- </tocitem>
- </tocitem>
-
- <tocitem text="Printing ">
- <tocitem text="Pen/Injection Data" target="GGC_PenInj_Print"/>
- <tocitem text="Food Menus" target="GGC_Food_Print"/>
- <tocitem text="Pump Data" target="PumpTool_Print"/>
- </tocitem>
-
- <tocitem text="Preferences">
- <tocitem text="Mode" target="GGC_Prefs_Mode"/>
- <tocitem text="General" target="GGC_Prefs_General"/>
- <tocitem text="Medical Data" target="GGC_Prefs_MedicalData"/>
- <tocitem text="Colors & Fonts" target="GGC_Prefs_Colors_Fonts"/>
- <tocitem text="Rendering Quality" target="GGC_Prefs_Rendering"/>
- <tocitem text="Printing" target="GGC_Prefs_Printing"/>
- <tocitem text="Language" target="GGC_Prefs_Language"/>
- </tocitem>
-
- <tocitem text="Tools">
- <tocitem text="Update" target="GGC_Tools_Update"/>
- <tocitem text="Backup" target="GGC_Tools_Backup"/>
- <tocitem text="Restore File Selector" target="GGC_Tools_Restore_File_Selector"/>
- <tocitem text="Restore" target="GGC_Tools_Restore"/>
- <tocitem text="Bolus Helper" target="GGC_Tools_BolusHelper"/>
- </tocitem>
-
-
- <tocitem text="Plug-ins ">
-
- <tocitem text="Meter Tool">
- <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/>
- <tocitem text="Reading View" target="DeviceTool_Reading_View"/>
- <tocitem text="Export Data" target="DeviceTool_Export_Data"/>
- <tocitem text="Configuration" target="DeviceTool_Configuration"/>
- <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/>
- <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/>
- <tocitem text="List" target="DeviceTool_List"/>
- <tocitem text="File Import" target="DeviceTool_File_Import"/>
- <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/>
- </tocitem>
-
- <tocitem text="Pump Tool">
- <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/>
- <tocitem text="Reading View" target="DeviceTool_Reading_View"/>
- <tocitem text="Reading Configuration View" target="DeviceTool_Reading_Config_View"/>
- <tocitem text="Export Data" target="DeviceTool_Export_Data"/>
- <tocitem text="Configuration" target="DeviceTool_Configuration"/>
- <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/>
- <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/>
- <tocitem text="List" target="DeviceTool_List"/>
- <tocitem text="File Import" target="DeviceTool_File_Import"/>
- <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/>
-
- <tocitem text="Manual Entry / Pump Data Overview">
-
- <tocitem text="Pump Data Overview" target="PumpTool_Data_Overview"/>
- <tocitem text="Pump Data Add/Edit" target="PumpTool_Data_AddEdit"/>
- <tocitem text="Add Additional Data 1" target="PumpTool_Data_Additional_1"/>
- <tocitem text="Add Additional Data 2" target="PumpTool_Data_Additional_2"/>
-
- <tocitem text="Bolus Helper" target="GGC_Tools_BolusHelper"/>
- <tocitem text="Food by Description" target="GGC_Tools_FoodDescription"/>
-
- <tocitem text="Profile Selector" target="PumpTool_Profile_Selector"/>
- <tocitem text="Profile Editor" target="PumpTool_Profile_Editor"/>
-
- <tocitem text="Profile Type Selector" target="PumpTool_Profile_Type_Selector"/>
- <tocitem text="Profile Entry Editor" target="PumpTool_Profile_Entry_Editor"/>
- </tocitem>
-
-
- <tocitem text="HbA1c ">
- <tocitem text="HbA1c View " target="GGC_BG_HbA1c"/>
- </tocitem>
-
- <tocitem text="Ratio ">
- <tocitem text="Base Ratio" target="GGC_Ratio_Base"/>
- <tocitem text="Extended Ratio" target="GGC_Ratio_Extended"/>
- <tocitem text="Ratio Calculator" target="GGC_Ratio_Calculator"/>
- </tocitem>
- </tocitem>
-
-
- <tocitem text="CGMS Tool">
- <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/>
- <tocitem text="Reading View" target="DeviceTool_Reading_View"/>
- <tocitem text="Export Data" target="DeviceTool_Export_Data"/>
- <tocitem text="Configuration" target="DeviceTool_Configuration"/>
- <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/>
- <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/>
- <tocitem text="List" target="DeviceTool_List"/>
- <tocitem text="File Import" target="DeviceTool_File_Import"/>
- <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/>
- </tocitem>
-
- </tocitem>
-
-</tocitem>
-</toc>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml (from rev 1397, trunk/ggc-help/src/main/resources/help/en/GGCTOC.xml)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/GGCTOC.xml 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN"
+ "http://java.sun.com/products/javahelp/toc_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net-->
+
+<toc version="1.0">
+ <tocitem text="GGC Help " target="GGC_Main">
+ <tocitem text="File ">
+ <tocitem text="Login " target="GGC_File_Login"/>
+ <tocitem text="Logout " target="GGC_File_Logout"/>
+ </tocitem>
+
+ <tocitem text="Pen/Injection">
+
+ <tocitem text="Daily ">
+ <tocitem text="Daily Entries View" target="GGC_BG_Daily_View"/>
+ <tocitem text="Daily Entries Add" target="GGC_BG_Daily_Add"/>
+ <tocitem text="Bolus Helper" target="GGC_PenInj_BolusHelper"/>
+ <tocitem text="Meals, Foods Selector" target="GGC_MFS_Daily_Selector"/>
+ <tocitem text="Meals, Foods Parts Selector" target="GGC_MFS_Item_Selector"/>
+ <tocitem text="Food by Description" target="GGC_Tools_FoodDescription"/>
+ </tocitem>
+
+ <tocitem text="Graph ">
+ <tocitem text="Course Graph" target="GGC_BG_Graph_Course"/>
+ <tocitem text="Spread Graph" target="GGC_BG_Graph_Spread"/>
+ <tocitem text="Frequency Graph" target="GGC_BG_Graph_Frequency"/>
+
+
+ </tocitem>
+
+ <tocitem text="HbA1c ">
+ <tocitem text="HbA1c View" target="GGC_BG_HbA1c"/>
+ </tocitem>
+
+ <tocitem text="Ratio ">
+ <tocitem text="Base Ratio" target="GGC_Ratio_Base"/>
+ <tocitem text="Extended Ratio" target="GGC_Ratio_Extended"/>
+ <tocitem text="Ratio Calculator" target="GGC_Ratio_Calculator"/>
+ </tocitem>
+ </tocitem>
+
+ <tocitem text="Food">
+ <tocitem text="USDA Database ">
+ <tocitem text="Main " target="GGC_Food_USDA_Main"/>
+ <tocitem text="Group View " target="GGC_Food_USDA_Group"/>
+ <tocitem text="Food View " target="GGC_Food_USDA_View"/>
+ </tocitem>
+
+ <tocitem text="User Database ">
+ <tocitem text="Main " target="GGC_Food_User_Main"/>
+ <tocitem text="Food Add/Edit " target="GGC_Food_User_Food_Edit"/>
+ <tocitem text="Food View " target="GGC_Food_User_Food_View"/>
+ <tocitem text="Group Add/Edit " target="GGC_Food_User_Group_Edit"/>
+ <tocitem text="Group View " target="GGC_Food_User_Group_View"/>
+ <tocitem text="Nutrition Selector Main " target="GGC_Food_User_Select_Nutrition_Main"/>
+ <tocitem text="Nutrition Selector " target="GGC_Food_User_Select_Nutrition"/>
+ <tocitem text="Home Weight Selector Main " target="GGC_Food_User_Select_HomeWeight_Main"/>
+ <tocitem text="Home Weight Selector " target="GGC_Food_User_Select_HomeWeight"/>
+ </tocitem>
+
+ <tocitem text="Meals Database ">
+ <tocitem text="Main " target="GGC_Food_Meal_Main"/>
+ <tocitem text="Group Add/Edit " target="GGC_Food_Meal_Group_Edit"/>
+ <tocitem text="Group View " target="GGC_Food_Meal_Group_View"/>
+ <tocitem text="Meal Add/Edit " target="GGC_Food_Meal_Meal_Edit"/>
+ <tocitem text="Meal View " target="GGC_Food_Meal_Meal_View"/>
+ <tocitem text="Food Parts Selector " target="GGC_Food_Meal_Select_FoodParts"/>
+ </tocitem>
+ </tocitem>
+
+ <tocitem text="Printing ">
+ <tocitem text="Pen/Injection Data" target="GGC_PenInj_Print"/>
+ <tocitem text="Food Menus" target="GGC_Food_Print"/>
+ <tocitem text="Pump Data" target="PumpTool_Print"/>
+ </tocitem>
+
+ <tocitem text="Graphs">
+ <tocitem text="Graphs for CGMS" target="CGMSTool_Graphs"/>
+ </tocitem>
+
+ <tocitem text="Preferences">
+ <tocitem text="Mode" target="GGC_Prefs_Mode"/>
+ <tocitem text="General" target="GGC_Prefs_General"/>
+ <tocitem text="Medical Data" target="GGC_Prefs_MedicalData"/>
+ <tocitem text="Colors & Fonts" target="GGC_Prefs_Colors_Fonts"/>
+ <tocitem text="Rendering Quality" target="GGC_Prefs_Rendering"/>
+ <tocitem text="Printing" target="GGC_Prefs_Printing"/>
+ <tocitem text="Language" target="GGC_Prefs_Language"/>
+ </tocitem>
+
+ <tocitem text="Misc">
+ <tocitem text="Doctors">
+ <tocitem text="Doctor's List" target="Doc_DocList"/>
+ <tocitem text="Add/Edit Doctor" target="Doc_DoctorDialog"/>
+ <tocitem text="Add/Edit Doctor Type" target="Doc_DocTypeDialog"/>
+ <tocitem text="Doctor Type Selector" target="Doc_DocTypeSelector"/>
+ <tocitem text="Add/Edit Working Time" target="Doc_WorkingTimeDialog"/>
+ <tocitem text="Add/Edit Time (from Working Time)" target="Doc_WorkingTimeTimeDialog"/>
+ </tocitem>
+ </tocitem>
+
+
+ <tocitem text="Tools">
+ <tocitem text="Update" target="GGC_Tools_Update"/>
+ <tocitem text="Backup" target="GGC_Tools_Backup"/>
+ <tocitem text="Restore File Selector" target="GGC_Tools_Restore_File_Selector"/>
+ <tocitem text="Restore" target="GGC_Tools_Restore"/>
+ <tocitem text="Bolus Helper" target="GGC_Tools_BolusHelper"/>
+ </tocitem>
+
+
+ <tocitem text="Plug-ins ">
+
+ <tocitem text="Meter Tool">
+ <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/>
+ <tocitem text="Reading View" target="DeviceTool_Reading_View"/>
+ <tocitem text="Export Data" target="DeviceTool_Export_Data"/>
+ <tocitem text="Configuration" target="DeviceTool_Configuration"/>
+ <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/>
+ <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/>
+ <tocitem text="List" target="DeviceTool_List"/>
+ <tocitem text="File Import" target="DeviceTool_File_Import"/>
+ <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/>
+ </tocitem>
+
+ <tocitem text="Pump Tool">
+ <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/>
+ <tocitem text="Reading View" target="DeviceTool_Reading_View"/>
+ <tocitem text="Reading Configuration View" target="DeviceTool_Reading_Config_View"/>
+ <tocitem text="Export Data" target="DeviceTool_Export_Data"/>
+ <tocitem text="Configuration" target="DeviceTool_Configuration"/>
+ <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/>
+ <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/>
+ <tocitem text="List" target="DeviceTool_List"/>
+ <tocitem text="File Import" target="DeviceTool_File_Import"/>
+ <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/>
+
+ <tocitem text="Manual Entry / Pump Data Overview">
+
+ <tocitem text="Pump Data Overview" target="PumpTool_Data_Overview"/>
+ <tocitem text="Pump Data Add/Edit" target="PumpTool_Data_AddEdit"/>
+ <tocitem text="Add Additional Data 1" target="PumpTool_Data_Additional_1"/>
+ <tocitem text="Add Additional Data 2" target="PumpTool_Data_Additional_2"/>
+
+ <tocitem text="Bolus Helper" target="GGC_Tools_BolusHelper"/>
+ <tocitem text="Food by Description" target="GGC_Tools_FoodDescription"/>
+
+ <tocitem text="Profile Selector" target="PumpTool_Profile_Selector"/>
+ <tocitem text="Profile Editor" target="PumpTool_Profile_Editor"/>
+
+ <tocitem text="Profile Type Selector" target="PumpTool_Profile_Type_Selector"/>
+ <tocitem text="Profile Entry Editor" target="PumpTool_Profile_Entry_Editor"/>
+ </tocitem>
+
+
+ <tocitem text="HbA1c ">
+ <tocitem text="HbA1c View " target="GGC_BG_HbA1c"/>
+ </tocitem>
+
+ <tocitem text="Ratio ">
+ <tocitem text="Base Ratio" target="GGC_Ratio_Base"/>
+ <tocitem text="Extended Ratio" target="GGC_Ratio_Extended"/>
+ <tocitem text="Ratio Calculator" target="GGC_Ratio_Calculator"/>
+ </tocitem>
+ </tocitem>
+
+
+ <tocitem text="CGMS Tool">
+ <tocitem text="Read Instruction" target="DeviceTool_Read_Instruction"/>
+ <tocitem text="Reading View" target="DeviceTool_Reading_View"/>
+ <tocitem text="Export Data" target="DeviceTool_Export_Data"/>
+ <tocitem text="Configuration" target="DeviceTool_Configuration"/>
+ <tocitem text="Configuration - Device Selector" target="DeviceTool_Configuration_DeviceSelector"/>
+ <tocitem text="Configuration - Port Selector" target="DeviceTool_Configuration_PortSelector"/>
+ <tocitem text="List" target="DeviceTool_List"/>
+ <tocitem text="File Import" target="DeviceTool_File_Import"/>
+ <tocitem text="File Import Type" target="DeviceTool_File_Import_Type"/>
+ </tocitem>
+
+ </tocitem>
+
+ </tocitem>
+</toc>
\ No newline at end of file
Deleted: trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm
===================================================================
--- trunk/ggc-help/src/main/resources/help/en/Map.jhm 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm 2016-12-25 11:49:54 UTC (rev 1414)
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net-->
-
-<map version="1.0">
- <mapID target="top" url="pages/GGC_Main.html "/>
- <mapID target="popup_icon" url="images/popup.gif "/>
-
-
- <mapID target="GGC_Main" url="pages/GGC_Main.html"/>
-
- <mapID target="GGC_File_Login" url="pages/GGC_File_Login.html"/>
- <mapID target="GGC_File_Logout" url="pages/GGC_File_Logout.html"/>
-
-
- <mapID target="GGC_BG_Daily_View" url="pages/GGC_BG_Daily_View.html"/>
- <mapID target="GGC_BG_HbA1c" url="pages/GGC_BG_HbA1c.html"/>
-
- <mapID target="GGC_BG_Graph_Daily" url="pages/GGC_BG_Graph_Daily.html"/>
- <mapID target="GGC_BG_Graph_Spread" url="pages/GGC_BG_Graph_Spread.html"/>
- <mapID target="GGC_BG_Graph_Course" url="pages/GGC_BG_Graph_Course.html"/>
- <mapID target="GGC_BG_Daily_Add" url="pages/GGC_BG_Daily_Add.html"/>
- <mapID target="GGC_BG_Graph_Frequency" url="pages/GGC_BG_Graph_Frequency.html"/>
-
-
- <mapID target="GGC_MFS_Daily_Selector" url="pages/GGC_MFS_Daily_Selector.html"/>
- <mapID target="GGC_MFS_Item_Selector" url="pages/GGC_MFS_Item_Selector.html"/>
-
-
- <mapID target="GGC_Ratio_Base" url="pages/GGC_Ratio_Base.html"/>
- <mapID target="GGC_Ratio_Extended" url="pages/GGC_Ratio_Extended.html"/>
- <mapID target="GGC_Ratio_Calculator" url="pages/GGC_Ratio_Calculator.html"/>
-
-
- <mapID target="GGC_Prefs_Main" url="pages/GGC_Prefs_Main.html"/>
- <mapID target="GGC_Prefs_Mode" url="pages/GGC_Prefs_Mode.html"/>
- <mapID target="GGC_Prefs_General" url="pages/GGC_Prefs_General.html"/>
- <mapID target="GGC_Prefs_Colors_Fonts" url="pages/GGC_Prefs_Colors_Fonts.html"/>
- <mapID target="GGC_Prefs_Rendering" url="pages/GGC_Prefs_Rendering.html"/>
- <mapID target="GGC_Prefs_MedicalData" url="pages/GGC_Prefs_MedicalData.html"/>
- <mapID target="GGC_Prefs_Printing" url="pages/GGC_Prefs_Printing.html"/>
- <mapID target="GGC_Prefs_Language" url="pages/GGC_Prefs_Language.html"/>
-
-
- <mapID target="GGC_PenInj_Print" url="pages/GGC_PenInj_Print.html"/>
- <mapID target="GGC_Food_Print" url="pages/GGC_Food_Print.html"/>
-
-
- <mapID target="GGC_Food_Meal_Main" url="pages/GGC_Food_Meal_Main.html"/>
- <mapID target="GGC_Food_User_Select_HomeWeight" url="pages/GGC_Food_User_Select_HomeWeight.html"/>
- <mapID target="GGC_Food_Meal_Meal_View" url="pages/GGC_Food_Meal_Meal_View.html"/>
- <mapID target="GGC_Food_Meal_Select_FoodParts" url="pages/GGC_Food_Meal_Select_FoodParts.html"/>
- <mapID target="GGC_Food_User_Food_View" url="pages/GGC_Food_User_Food_View.html"/>
- <mapID target="GGC_Food_User_Select_Nutrition" url="pages/GGC_Food_User_Select_Nutrition.html"/>
- <mapID target="GGC_Food_Meal_Group_View" url="pages/GGC_Food_Meal_Group_View.html"/>
- <mapID target="GGC_Food_User_Group_View" url="pages/GGC_Food_User_Group_View.html"/>
- <mapID target="GGC_Food_User_Group_Edit" url="pages/GGC_Food_User_Group_Edit.html"/>
- <mapID target="GGC_Food_Meal_Meal_Edit" url="pages/GGC_Food_Meal_Meal_Edit.html"/>
- <mapID target="GGC_Food_User_Food_Edit" url="pages/GGC_Food_User_Food_Edit.html"/>
- <mapID target="GGC_Food_User_Select_Nutrition_Main" url="pages/GGC_Food_User_Select_Nutrition_Main.html"/>
- <mapID target="GGC_Food_User_Main" url="pages/GGC_Food_User_Main.html"/>
- <mapID target="GGC_Food_USDA_View" url="pages/GGC_Food_USDA_View.html"/>
- <mapID target="GGC_Food_User_Select_HomeWeight_Main" url="pages/GGC_Food_User_Select_HomeWeight_Main.html"/>
- <mapID target="GGC_Food_USDA_Group" url="pages/GGC_Food_USDA_Group.html"/>
- <mapID target="GGC_Food_Meal_Group_Edit" url="pages/GGC_Food_Meal_Group_Edit.html"/>
- <mapID target="GGC_Food_USDA_Main" url="pages/GGC_Food_USDA_Main.html"/>
-
-
- <mapID target="GGC_Tools_Update" url="pages/GGC_Tools_Update.html"/>
- <mapID target="GGC_Tools_Backup" url="pages/GGC_Tools_Backup.html"/>
- <mapID target="GGC_Tools_Restore" url="pages/GGC_Tools_Restore.html"/>
- <mapID target="GGC_Tools_Restore_File_Selector" url="pages/GGC_Tools_Restore_File_Selector.html"/>
- <mapID target="GGC_Tools_BolusHelper" url="pages/GGC_Tools_BolusHelper.html"/>
- <mapID target="GGC_Tools_FoodDescription" url="pages/GGC_Tools_FoodDescription.html"/>
-
-
- <mapID target="DeviceTool_Read_Instruction" url="pages/DeviceTool_Read_Instruction.html"/>
- <mapID target="DeviceTool_Reading_View" url="pages/DeviceTool_Reading_View.html"/>
- <mapID target="DeviceTool_Reading_Config_View" url="pages/DeviceTool_Reading_Config_View.html"/>
- <mapID target="DeviceTool_Export_Data" url="pages/DeviceTool_Export_Data.html"/>
- <mapID target="DeviceTool_Configuration" url="pages/DeviceTool_Configuration.html"/>
- <mapID target="DeviceTool_Configuration_DeviceSelector" url="pages/DeviceTool_Configuration_DeviceSelector.html"/>
- <mapID target="DeviceTool_Configuration_PortSelector" url="pages/DeviceTool_Configuration_PortSelector.html"/>
- <mapID target="DeviceTool_List" url="pages/DeviceTool_List.html"/>
- <mapID target="DeviceTool_File_Import" url="pages/DeviceTool_File_Import.html"/>
- <mapID target="DeviceTool_File_Import_Type" url="pages/DeviceTool_File_Import_Type.html"/>
-
-
- <mapID target="PumpTool_Print" url="pages/PumpTool_Print.html"/>
-
- <mapID target="PumpTool_Data_Overview" url="pages/PumpTool_Data_Overview.html"/>
- <mapID target="PumpTool_Data_AddEdit" url="pages/PumpTool_Data_AddEdit.html"/>
- <mapID target="PumpTool_Data_Additional_1" url="pages/PumpTool_Data_Additional_1.html"/>
- <mapID target="PumpTool_Data_Additional_2" url="pages/PumpTool_Data_Additional_2.html"/>
- <mapID target="PumpTool_Profile_Selector" url="pages/PumpTool_Profile_Selector.html"/>
- <mapID target="PumpTool_Profile_Editor" url="pages/PumpTool_Profile_Editor.html"/>
- <mapID target="PumpTool_Profile_Type_Selector" url="pages/PumpTool_Profile_Editor.html"/>
- <mapID target="PumpTool_Profile_Entry_Editor" url="pages/PumpTool_Profile_Entry_Editor.html"/>
-
-
- <mapID target="images.popup" url="images/popup.gif"/>
-
-</map>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm (from rev 1397, trunk/ggc-help/src/main/resources/help/en/Map.jhm)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/Map.jhm 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN"
+ "http://java.sun.com/products/javahelp/map_2_0.dtd"><!--generated by JHelpDev Version: 0.62, 10 November 2006, see jhelpdev.sourceforge.net-->
+
+<map version="1.0">
+ <mapID target="top" url="pages/GGC_Main.html "/>
+ <mapID target="popup_icon" url="images/popup.gif "/>
+
+
+ <mapID target="GGC_Main" url="pages/GGC_Main.html"/>
+
+ <mapID target="GGC_File_Login" url="pages/GGC_File_Login.html"/>
+ <mapID target="GGC_File_Logout" url="pages/GGC_File_Logout.html"/>
+
+
+ <mapID target="GGC_BG_Daily_View" url="pages/GGC_BG_Daily_View.html"/>
+ <mapID target="GGC_BG_Daily_Add" url="pages/GGC_BG_Daily_Add.html"/>
+
+ <mapID target="GGC_BG_HbA1c" url="pages/GGC_BG_HbA1c.html"/>
+ <mapID target="GGC_BG_Graph_Daily" url="pages/GGC_BG_Graph_Daily.html"/>
+ <mapID target="GGC_BG_Graph_Spread" url="pages/GGC_BG_Graph_Spread.html"/>
+ <mapID target="GGC_BG_Graph_Course" url="pages/GGC_BG_Graph_Course.html"/>
+ <mapID target="GGC_BG_Graph_Frequency" url="pages/GGC_BG_Graph_Frequency.html"/>
+
+
+ <mapID target="GGC_MFS_Daily_Selector" url="pages/GGC_MFS_Daily_Selector.html"/>
+ <mapID target="GGC_MFS_Item_Selector" url="pages/GGC_MFS_Item_Selector.html"/>
+
+
+ <mapID target="GGC_Ratio_Base" url="pages/GGC_Ratio_Base.html"/>
+ <mapID target="GGC_Ratio_Extended" url="pages/GGC_Ratio_Extended.html"/>
+ <mapID target="GGC_Ratio_Calculator" url="pages/GGC_Ratio_Calculator.html"/>
+ <mapID target="GGC_Ratio_Entry" url="pages/GGC_Ratio_Entry.html"/>
+
+
+ <mapID target="GGC_Prefs_Main" url="pages/GGC_Prefs_Main.html"/>
+ <mapID target="GGC_Prefs_Mode" url="pages/GGC_Prefs_Mode.html"/>
+ <mapID target="GGC_Prefs_General" url="pages/GGC_Prefs_General.html"/>
+ <mapID target="GGC_Prefs_Colors_Fonts" url="pages/GGC_Prefs_Colors_Fonts.html"/>
+ <mapID target="GGC_Prefs_Rendering" url="pages/GGC_Prefs_Rendering.html"/>
+ <mapID target="GGC_Prefs_MedicalData" url="pages/GGC_Prefs_MedicalData.html"/>
+ <mapID target="GGC_Prefs_Printing" url="pages/GGC_Prefs_Printing.html"/>
+ <mapID target="GGC_Prefs_Language" url="pages/GGC_Prefs_Language.html"/>
+ <mapID target="GGC_Prefs_Pump" url="pages/GGC_Prefs_Pump.html"/>
+ <mapID target="GGC_Prefs_CGMS" url="pages/GGC_Prefs_CGMS.html"/>
+
+
+ <mapID target="GGC_PenInj_Print" url="pages/GGC_Print_Pen.html"/>
+ <!-- FIx keywords -->
+ <mapID target="GGC_Food_Print" url="pages/GGC_Print_FoodMenu.html"/>
+ <mapID target="PumpTool_Print" url="pages/GGC_Print_Pump.html"/>
+ <mapID target="CGMSTool_Print" url="pages/GGC_Print_CGMS.html"/>
+
+ <mapID target="CGMSTool_Graphs" url="pages/GGC_Graph_CGMS.html"/>
+
+
+ <mapID target="GGC_Food_USDA_Main" url="pages/GGC_Food_USDA_Main.html"/>
+ <mapID target="GGC_Food_USDA_View" url="pages/GGC_Food_USDA_View.html"/>
+ <mapID target="GGC_Food_USDA_Group" url="pages/GGC_Food_USDA_Group.html"/>
+
+ <mapID target="GGC_Food_User_Main" url="pages/GGC_Food_User_Main.html"/>
+ <mapID target="GGC_Food_User_Food_View" url="pages/GGC_Food_User_Food_View.html"/>
+ <mapID target="GGC_Food_User_Food_Edit" url="pages/GGC_Food_User_Food_Edit.html"/>
+ <mapID target="GGC_Food_User_Group_View" url="pages/GGC_Food_User_Group_View.html"/>
+ <mapID target="GGC_Food_User_Group_Edit" url="pages/GGC_Food_User_Group_Edit.html"/>
+
+ <mapID target="GGC_Food_User_Group_Select" url="pages/GGC_Food_User_Select_Group.html"/>
+ <mapID target="GGC_Food_User_Select_Nutrition_Main" url="pages/GGC_Food_User_Select_Nutrition_Main.html"/>
+ <mapID target="GGC_Food_User_Select_Nutrition" url="pages/GGC_Food_User_Select_Nutrition.html"/>
+ <mapID target="GGC_Food_User_Select_HomeWeight_Main" url="pages/GGC_Food_User_Select_HomeWeight_Main.html"/>
+ <mapID target="GGC_Food_User_Select_HomeWeight" url="pages/GGC_Food_User_Select_HomeWeight.html"/>
+
+
+ <mapID target="GGC_Food_Meal_Main" url="pages/GGC_Food_Meal_Main.html"/>
+ <mapID target="GGC_Food_Meal_Meal_View" url="pages/GGC_Food_Meal_Meal_View.html"/>
+ <mapID target="GGC_Food_Meal_Meal_Edit" url="pages/GGC_Food_Meal_Meal_Edit.html"/>
+ <mapID target="GGC_Food_Meal_Select_FoodParts" url="pages/GGC_Food_Meal_Select_FoodParts.html"/>
+ <mapID target="GGC_Food_Meal_Group_View" url="pages/GGC_Food_Meal_Group_View.html"/>
+ <mapID target="GGC_Food_Meal_Group_Edit" url="pages/GGC_Food_Meal_Group_Edit.html"/>
+
+
+ <mapID target="GGC_Tools_Update" url="pages/GGC_Tools_Update.html"/>
+ <mapID target="GGC_Tools_Backup" url="pages/GGC_Tools_Backup.html"/>
+ <mapID target="GGC_Tools_Restore" url="pages/GGC_Tools_Restore.html"/>
+ <mapID target="GGC_Tools_Restore_File_Selector" url="pages/GGC_Tools_Restore_File_Selector.html"/>
+ <mapID target="GGC_Tools_BolusHelper" url="pages/GGC_Tools_BolusHelper.html"/>
+ <mapID target="GGC_Tools_FoodDescription" url="pages/GGC_Tools_FoodDescription.html"/>
+
+
+ <mapID target="DeviceTool_Read_Instruction" url="pages/DeviceTool_Read_Instruction.html"/>
+ <mapID target="DeviceTool_Reading_View" url="pages/DeviceTool_Reading_View.html"/>
+ <mapID target="DeviceTool_Reading_Config_View" url="pages/DeviceTool_Reading_Config_View.html"/>
+ <mapID target="DeviceTool_Export_Data" url="pages/DeviceTool_Export_Data.html"/>
+ <mapID target="DeviceTool_Configuration" url="pages/DeviceTool_Configuration.html"/>
+ <mapID target="DeviceTool_Configuration_DeviceSelector" url="pages/DeviceTool_Configuration_DeviceSelector.html"/>
+ <mapID target="DeviceTool_Configuration_PortSelector" url="pages/DeviceTool_Configuration_PortSelector.html"/>
+ <mapID target="DeviceTool_List" url="pages/DeviceTool_List.html"/>
+ <mapID target="DeviceTool_File_Import" url="pages/DeviceTool_File_Import.html"/>
+ <mapID target="DeviceTool_File_Import_Type" url="pages/DeviceTool_File_Import_Type.html"/>
+
+
+ <mapID target="PumpTool_Data_Overview" url="pages/PumpTool_Data_Overview.html"/>
+ <mapID target="PumpTool_Data_AddEdit" url="pages/PumpTool_Data_AddEdit.html"/>
+ <mapID target="PumpTool_Data_Additional_1" url="pages/PumpTool_Data_Additional_1.html"/>
+ <mapID target="PumpTool_Data_Additional_2" url="pages/PumpTool_Data_Additional_2.html"/>
+ <mapID target="PumpTool_Profile_Selector" url="pages/PumpTool_Profile_Selector.html"/>
+ <mapID target="PumpTool_Profile_Editor" url="pages/PumpTool_Profile_Editor.html"/>
+ <mapID target="PumpTool_Profile_Entry_Editor" url="pages/PumpTool_Profile_Entry_Editor.html"/>
+ <mapID target="PumpTool_Profile_Type_Selector" url="pages/PumpTool_Profile_Type_Selector.html"/>
+
+ <!-- Doctor -->
+ <mapID target="Doc_DocList" url="pages/GGC_Doc_DocList.html"/>
+ <mapID target="Doc_DoctorDialog" url="pages/GGC_Doc_DoctorDialog.html"/>
+ <mapID target="Doc_DocTypeDialog" url="pages/GGC_Doc_DocTypeAddEdit.html"/>
+ <mapID target="Doc_DocTypeSelector" url="pages/GGC_Doc_DocTypeSelector.html"/>
+ <mapID target="Doc_WorkingTimeDialog" url="pages/GGC_Doc_WorkingTimeDialog.html"/>
+ <mapID target="Doc_WorkingTimeTimeDialog" url="pages/GGC_Doc_WorkingTimeTimeDialog.html"/>
+
+ <mapID target="images.popup" url="images/popup.gif"/>
+
+</map>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocList.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,7 @@
+<html>
+<body>
+<h1>Doctor's List</h1>
+
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeAddEdit.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,7 @@
+<html>
+<body>
+<h1>Add/Edit Doctor Type</h1>
+
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DocTypeSelector.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,7 @@
+<html>
+<body>
+<h1>Doctor Type Selector</h1>
+
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_DoctorDialog.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,7 @@
+<html>
+<body>
+<h1>Add/Edit Doctor</h1>
+
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeDialog.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,7 @@
+<html>
+<body>
+<h1>Add/Edit Working Time</h1>
+
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Doc_WorkingTimeTimeDialog.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,7 @@
+<html>
+<body>
+<h1>Add/Edit Time (for Working Time)</h1>
+
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Food_User_Select_Group.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,8 @@
+<html>
+<body>
+<h1>User Db - Select Group</h1>
+<br>
+This help file is not available yet. English help should be available (at least) in version 1.0.
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html (from rev 1397, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Graph_CGMS.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,7 @@
+<html>
+<title>Graphs - CGMS</title>
+
+<body>
+<h1>Graphs - CGMS</h1>
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_CGMS.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,8 @@
+<html>
+<body>
+<h1>Preferences - CGMS</h1>
+<br>
+This help file is not available yet. English help should be available (at least) in version 1.0.
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Prefs_Pump.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,8 @@
+<html>
+<body>
+<h1>Preferences - Pump</h1>
+<br>
+This help file is not available yet. English help should be available (at least) in version 1.0.
+
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Print_CGMS.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,7 @@
+<html>
+<title>Printing CGMS Data</title>
+
+<body>
+<h1>Printing Pump Data</h1>
+</body>
+</html>
\ No newline at end of file
Copied: trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html (from rev 1380, trunk/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html)
===================================================================
--- trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html (rev 0)
+++ trunk/ggc-support/ggc-help/src/main/resources/help/en/pages/GGC_Ratio_Entry.html 2016-12-25 11:49:54 UTC (rev 1414)
@@ -0,0 +1,10 @@
+<html>
+<title>Ratio - Extended - Entry</title>
+
+<body>
+<h1>Ratio - Extended</h1>
+<br>
+This help file is not available yet. English help should be available (at least) in version 1.0.
+
+</body>
+</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 11:53:31
|
Revision: 1415
http://sourceforge.net/p/ggc/code/1415
Author: andyrozman
Date: 2016-12-25 11:53:28 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Support
- moved ggc-language-tool
- moved ggc-usb
- moved ggc-test
Modified Paths:
--------------
trunk/ggc-support/ggc-usb/freebsd/bin/run_freebsd.sh
trunk/ggc-support/ggc-usb/linux/bin/run_linux.sh
trunk/ggc-support/ggc-usb/mac/bin/run_mac.bash
Added Paths:
-----------
trunk/ggc-support/ggc-language_tool/
trunk/ggc-support/ggc-test/
trunk/ggc-support/ggc-usb/
Removed Paths:
-------------
trunk/ggc-language_tool/
trunk/ggc-test/
trunk/ggc-usb/
Modified: trunk/ggc-support/ggc-usb/freebsd/bin/run_freebsd.sh
===================================================================
--- trunk/ggc-usb/freebsd/bin/run_freebsd.sh 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-usb/freebsd/bin/run_freebsd.sh 2016-12-25 11:53:28 UTC (rev 1415)
@@ -4,14 +4,14 @@
# ******** Set Java Path (calling setenv_java if exists) ****
# **********************************************************************
if [ -x ./setenv_java_freebsd.sh ]; then
- . ./setenv_java_freebsd.sh
+ . setenv_java_freebsd.sh
fi
# **********************************************************************
# ******** Set ATech Tools Startup Jar ****
# **********************************************************************
-. ./setenv_atech.sh
+. setenv_atech.sh
# **********************************************************************
Modified: trunk/ggc-support/ggc-usb/linux/bin/run_linux.sh
===================================================================
--- trunk/ggc-usb/linux/bin/run_linux.sh 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-usb/linux/bin/run_linux.sh 2016-12-25 11:53:28 UTC (rev 1415)
@@ -11,14 +11,14 @@
# ******** Set Java Path (calling setenv_java if exists) ****
# **********************************************************************
if [ -f ./setenv_java_linux.sh ]; then
- . ./setenv_java_linux.sh
+ . setenv_java_linux.sh
fi
# **********************************************************************
# ******** Set ATech Tools Startup Jar ****
# **********************************************************************
-. ./setenv_atech.sh
+. setenv_atech.sh
# **********************************************************************
Modified: trunk/ggc-support/ggc-usb/mac/bin/run_mac.bash
===================================================================
--- trunk/ggc-usb/mac/bin/run_mac.bash 2015-10-06 18:05:41 UTC (rev 1367)
+++ trunk/ggc-support/ggc-usb/mac/bin/run_mac.bash 2016-12-25 11:53:28 UTC (rev 1415)
@@ -11,7 +11,7 @@
# **********************************************************************
# ******** Set ATech Tools Startup Jar ****
# **********************************************************************
-. ./setenv_atech.bash
+. setenv_atech.bash
# **********************************************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 12:00:10
|
Revision: 1416
http://sourceforge.net/p/ggc/code/1416
Author: andyrozman
Date: 2016-12-25 12:00:08 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
adding 2nd level root projects for ggc
- ggc-desktop-app
- ggc-android-app
- ggc-plugins
- ggc-desktop-app
Added Paths:
-----------
trunk/ggc-doctor-app/
trunk/ggc-plugins/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 13:16:58
|
Revision: 1417
http://sourceforge.net/p/ggc/code/1417
Author: andyrozman
Date: 2016-12-25 13:16:57 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc-desktop-app added pom
ggc-plugins added pom
Added Paths:
-----------
trunk/ggc-desktop-app/
trunk/ggc-desktop-app/pom.xml
trunk/ggc-plugins/pom.xml
Added: trunk/ggc-desktop-app/pom.xml
===================================================================
--- trunk/ggc-desktop-app/pom.xml (rev 0)
+++ trunk/ggc-desktop-app/pom.xml 2016-12-25 13:16:57 UTC (rev 1417)
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-root</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>GGC Desktop App</name>
+ <artifactId>ggc-desktop-app</artifactId>
+ <packaging>pom</packaging>
+
+ <!--
+ <modules>
+ <module>ggc-help</module>
+ </modules>
+ -->
+
+</project>
Added: trunk/ggc-plugins/pom.xml
===================================================================
--- trunk/ggc-plugins/pom.xml (rev 0)
+++ trunk/ggc-plugins/pom.xml 2016-12-25 13:16:57 UTC (rev 1417)
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-root</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>GGC Plugins</name>
+ <artifactId>ggc-plugins</artifactId>
+ <packaging>pom</packaging>
+
+ <!--
+ <modules>
+ <module>ggc-help</module>
+ </modules>
+-->
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 13:55:34
|
Revision: 1421
http://sourceforge.net/p/ggc/code/1421
Author: andyrozman
Date: 2016-12-25 13:55:31 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Core App
- moved ggc-core here
Modified Paths:
--------------
trunk/ggc-core-app/ggc-core/build/build.xml
trunk/ggc-core-app/ggc-core/build/build_help.xml
trunk/ggc-support/ggc-help/pom.xml
Added Paths:
-----------
trunk/ggc-core-app/
trunk/ggc-core-app/ggc-core/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_CGMS.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Main.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_New.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Nutrition.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Other.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Pump.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_de.properties
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_en.properties
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_fr.properties
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_si.properties
trunk/ggc-core-app/ggc-core/src/main/resources/log4j.properties
trunk/ggc-core-app/pom.xml
trunk/ggc-pump/src/ggc/pump/gui/pdtc/
Removed Paths:
-------------
trunk/ggc-core/
trunk/ggc-core-app/ggc-core/src/GGC_CGMS.hbm.xml
trunk/ggc-core-app/ggc-core/src/GGC_Main.hbm.xml
trunk/ggc-core-app/ggc-core/src/GGC_New.hbm.xml
trunk/ggc-core-app/ggc-core/src/GGC_Nutrition.hbm.xml
trunk/ggc-core-app/ggc-core/src/GGC_Other.hbm.xml
trunk/ggc-core-app/ggc-core/src/GGC_Pump.hbm.xml
trunk/ggc-core-app/ggc-core/src/GGC_de.properties
trunk/ggc-core-app/ggc-core/src/GGC_en.properties
trunk/ggc-core-app/ggc-core/src/GGC_fr.properties
trunk/ggc-core-app/ggc-core/src/GGC_si.properties
trunk/ggc-core-app/ggc-core/src/ggc/
trunk/ggc-core-app/ggc-core/src/log4j.properties
Modified: trunk/ggc-core-app/ggc-core/build/build.xml
===================================================================
--- trunk/ggc-core/build/build.xml 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/build/build.xml 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,13 +1,13 @@
<?xml version="1.0" ?>
-<project name="GNU Gluco Control" default="build" basedir=".">
+<project name="GNU Gluco Control" default="build" basedir="">
<description>
Build file for GGC
</description>
<!-- Environment properties read from a file ...-->
<property file="../../build/AtechTools.properties"/>
- <property file="./GGCBuild.properties"/>
- <property file="./GGC_Core_Version.properties"/>
+ <property file="GGCBuild.properties"/>
+ <property file="GGC_Core_Version.properties"/>
<!-- These should *not* be modified on the command line! -->
Modified: trunk/ggc-core-app/ggc-core/build/build_help.xml
===================================================================
--- trunk/ggc-core/build/build_help.xml 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/build/build_help.xml 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,13 +1,13 @@
<?xml version="1.0" ?>
-<project name="GNU Gluco Control" default="build" basedir=".">
+<project name="GNU Gluco Control" default="build" basedir="">
<description>
Build file for GGC
</description>
<!-- Environment properties read from a file ...-->
<property file="../../build/AtechTools.properties"/>
- <property file="./GGCBuild.properties"/>
- <property file="./GGC_Core_Version.properties"/>
+ <property file="GGCBuild.properties"/>
+ <property file="GGC_Core_Version.properties"/>
<!-- These should *not* be modified on the command line! -->
Deleted: trunk/ggc-core-app/ggc-core/src/GGC_CGMS.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_CGMS.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/src/GGC_CGMS.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping>
-
- <!-- ***************** ggc::CGM SCHEMA ******************* -->
-
-
- <!-- CGMS Data -->
- <class name="ggc.core.db.hibernate.cgms.CGMSDataH" table="cgm_data" >
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="dt_info" type="long" not-null="true"/>
- <property name="base_type" type="int" />
- <property name="sub_type" type="int" />
- <property name="value" type="string" length="2000" />
- <property name="extended" type="text" />
- <property name="person_id" type="int" not-null="true" />
- <property name="comment" type="string" length="2000" />
- <property name="changed" type="long" not-null="false" />
- </class>
-
-
- <!-- Pump Data Additional Info-->
- <class name="ggc.core.db.hibernate.cgms.CGMSDataExtendedH" table="cgm_data_ext" >
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="dt_info" type="long" not-null="true"/>
- <property name="type" type="int" />
- <property name="value" type="string" length="2000" />
- <property name="extended" type="text" />
- <property name="person_id" type="int" not-null="true" />
- <property name="comment" type="string" length="2000" />
- <property name="changed" type="long" not-null="false" />
- </class>
-
-
-</hibernate-mapping>
Deleted: trunk/ggc-core-app/ggc-core/src/GGC_Main.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_Main.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/src/GGC_Main.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping>
-
- <!-- ***************** ggc::Main SCHEMA ******************* -->
-
-
- <!-- ****************************************** -->
- <!-- *** Patient Data **** -->
- <!-- ****************************************** -->
-
- <!-- DayValueH: last_change=[db=7] -->
- <class name="ggc.core.db.hibernate.DayValueH" table="data_dayvalues">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="dt_info" type="long" not-null="true"/>
- <property name="bg" type="int"/>
- <property name="ins1" type="int"/>
- <property name="ins2" type="int"/>
- <property name="ch" type="float"/>
- <property name="meals_ids" type="text"/>
- <property name="extended" type="text"/>
- <property name="person_id" type="int" not-null="true"/>
- <property name="comment" type="string" length="2000"/>
- <property name="changed" type="long" not-null="false"/>
- </class>
-
-
- <!-- ****************************************** -->
- <!-- *** Configuration **** -->
- <!-- ****************************************** -->
-
- <!-- SettingsH: last_change=[db=7] -->
- <class name="ggc.core.db.hibernate.SettingsH" table="cfg_settings">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="key" column="el_key" type="string" length="44" not-null="true"/>
- <property name="value" column="el_value" type="string" length="255"/>
- <property name="type" type="int"/>
- <!-- 1-string, 2-int, 3=float -->
- <property name="description" type="string" length="255"/>
- <property name="person_id" type="int" not-null="true"/>
- </class>
-
-
- <!-- ColorSchemeH: last_change=[db=7] -->
- <class name="ggc.core.db.hibernate.ColorSchemeH" table="cfg_colorscheme">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="50"/>
- <property name="custom_type" type="int"/>
- <property name="color_bg" type="int"/>
- <property name="color_bg_avg" type="int"/>
- <property name="color_bg_low" type="int"/>
- <property name="color_bg_high" type="int"/>
- <property name="color_bg_target" type="int"/>
- <property name="color_ins" type="int"/>
- <property name="color_ins1" type="int"/>
- <property name="color_ins2" type="int"/>
- <property name="color_ins_perbu" type="int"/>
- <property name="color_ch" type="int"/>
- </class>
-
-
- <!--
- <class name="ggc.core.db.hibernate.DbInfoH" table="db_info">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="key" column="el_key" type="string" length="44" not-null="true"/>
- <property name="value" column="el_value" type="string" length="255"/>
- <property name="type" type="int"/>
- <! 1-string, 2-int, 3=float -->
- <!-- <property name="description" type="string" length="255"/>
- </class> -->
-
-
-</hibernate-mapping>
Deleted: trunk/ggc-core-app/ggc-core/src/GGC_New.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_New.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/src/GGC_New.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,136 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping>
-
- <!--
- Mappings put here and for new functionalities that were not "deployed" yet. This is read only if you start
- GGC with dev parameter (on development database with correct columns). If you try to use this on production
- Db you will get exception and GGC won't start.
- -->
-
-
- <!-- ****************************************** -->
- <!-- *** Stocks **** -->
- <!-- ****************************************** -->
-
- <!-- Stock types -->
- <!--
- <class name="ggc.core.db.hibernate.StockTypeH" table="stock_types">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="1000" />
- <property name="name_i18n" type="string" length="1000" />
- </class>
- -->
-
-
- <class name="ggc.core.db.hibernate.StockSubTypeH" table="stock_subtypes">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="stockTypeId" column="stock_type_id" type="java.lang.Long"/>
- <property name="name" type="java.lang.String" length="512"/>
- <property name="description" type="java.lang.String" length="2000"/>
- <property name="packageContent" column="package_content" type="java.lang.Long"/>
- <property name="packageContentUnit" column="package_content_unit" type="java.lang.String" length="100"/>
- <property name="usageUnit" column="usage_unit" type="java.lang.Integer"/>
- <property name="usageMin" column="usage_min" type="java.lang.Integer"/>
- <property name="usageMax" column="usage_max" type="java.lang.Integer"/>
- <property name="active" type="java.lang.Boolean"/>
- <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/>
- <property name="extended" type="text"/>
- <property name="comment" type="java.lang.String" length="2000"/>
- </class>
-
- <class name="ggc.core.db.hibernate.StockH" table="stock_stocks">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
-
- <!-- <property name="stockSubtypeId" column="stock_subtype_id" type="java.lang.Long" /> -->
-
- <many-to-one name="stockSubtype" class="ggc.core.db.hibernate.StockSubTypeH" fetch="select">
- <column name="stock_subtype_id" not-null="true"/>
- </many-to-one>
-
- <property name="stocktakingId" column="stocktaking_id" type="java.lang.Long"/>
- <property name="amount" type="java.lang.Long"/>
- <property name="location" type="java.lang.String" length="1000"/>
- <property name="validFrom" column="valid_from" type="java.lang.Long"/>
- <property name="validTill" column="valid_till" type="java.lang.Long"/>
-
- <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/>
- <property name="extended" type="text"/>
- <property name="comment" type="java.lang.String" length="2000"/>
- </class>
-
-
- <class name="ggc.core.db.hibernate.StocktakingH" table="stock_stocktaking">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="datetime" column="dt_stocktaking" type="java.lang.Long"/>
- <property name="description" type="java.lang.String" length="2000"/>
-
- <property name="personId" column="person_id" type="java.lang.Integer" not-null="true"/>
- <property name="extended" type="text"/>
- <property name="comment" type="java.lang.String" length="2000"/>
- <property name="changed" type="java.lang.Long"/>
- </class>
-
-
- <!-- ****************************************** -->
- <!-- *** Doctors **** -->
- <!-- ****************************************** -->
-
-
- <!-- Doctor types -->
- <class name="ggc.core.db.hibernate.doc.DoctorTypeH" table="doc_types">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="1000"/>
- <property name="predefined" type="int"/>
- </class>
-
- <!-- Doctor -->
- <class name="ggc.core.db.hibernate.doc.DoctorH" table="doc_doctors">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <many-to-one name="doctorType" column="doctor_type_id" class="ggc.core.db.hibernate.doc.DoctorTypeH"
- lazy="false"/>
- <property name="name" type="string" length="100"/>
- <property name="address" type="string" length="2000"/>
- <property name="phoneGsm" column="phone_gsm" type="string" length="500"/>
- <property name="phone" type="string" length="500"/>
- <property name="email" type="string" length="500"/>
- <property name="workingTime" column="working_time" type="text"/>
- <property name="activeFrom" column="active_from" type="long"/>
- <property name="activeTill" column="active_till" type="long"/>
- <property name="extended" type="text"/>
- <property name="personId" column="person_id" type="int" not-null="true"/>
- <property name="comment" type="string" length="4000"/>
- </class>
-
- <!-- Appointment -->
- <class name="ggc.core.db.hibernate.doc.DoctorAppointmentH" table="doc_appointment">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <many-to-one name="doctor" class="ggc.core.db.hibernate.doc.DoctorH" lazy="false"/>
- <property name="dt_apoint" type="long" not-null="true"/>
- <property name="apoint_text" type="string" length="1000"/>
- <property name="extended" type="text"/>
- <property name="personId" column="person_id" type="int" not-null="true"/>
- <property name="comment" type="string" length="4000"/>
- </class>
-
-
- <!-- ****************************************** -->
- <!-- *** Connect **** -->
- <!-- ****************************************** -->
-
-
-</hibernate-mapping>
\ No newline at end of file
Deleted: trunk/ggc-core-app/ggc-core/src/GGC_Nutrition.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_Nutrition.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/src/GGC_Nutrition.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping>
-
- <!-- ***************** GGC::Nutrition SCHEMA ******************* -->
-
-
- <!-- Nutrition Definition - Global -->
- <class name="ggc.core.db.hibernate.food.NutritionDefinitionH" table="nutrition_definition">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="weight_unit" type="string" length="50"/>
- <property name="tag" type="string" length="50"/>
- <property name="name" type="string" length="100"/>
- <property name="decimal_places" type="text" length="10"/>
- <property name="static_entry" type="int"/>
- </class>
-
- <!-- Nutrition Home Weight Type - Global -->
- <class name="ggc.core.db.hibernate.food.NutritionHomeWeightTypeH" table="nutrition_home_weight_type">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255"/>
- <property name="static_entry" type="int"/>
- </class>
-
-
- <!-- Food Group - Nutrition 1 -->
- <class name="ggc.core.db.hibernate.food.FoodGroupH" table="nutrition_usda_food_group">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255"/>
- <property name="name_i18n" type="string" length="255"/>
- <property name="description" type="string" length="1000"/>
- </class>
-
-
- <!-- Food Description - - Nutrition 1-->
- <class name="ggc.core.db.hibernate.food.FoodDescriptionH" table="nutrition_usda_food_description">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="group_id" type="long"/>
- <property name="name" type="string" length="255"/>
- <property name="name_i18n" type="string" length="255"/>
- <property name="refuse" type="float"/>
- <property name="nutritions" type="text"/>
- <property name="home_weights" type="text"/>
- </class>
-
-
- <!-- Food Group - Nutrition 2 -->
- <class name="ggc.core.db.hibernate.food.FoodUserGroupH" table="nutrition_user_food_group">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255"/>
- <property name="name_i18n" type="string" length="255"/>
- <property name="description" type="string" length="1000"/>
- <property name="parent_id" type="long"/>
- <property name="changed" type="long" not-null="false"/>
- </class>
-
-
- <!-- Food Description - - Nutrition 2-->
- <class name="ggc.core.db.hibernate.food.FoodUserDescriptionH" table="nutrition_user_food_description">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="group_id" type="long"/>
- <property name="name" type="string" length="255"/>
- <property name="name_i18n" type="string" length="255"/>
- <property name="description" type="string" length="1000"/>
- <property name="refuse" type="float"/>
- <property name="nutritions" type="text"/>
- <property name="home_weights" type="text"/>
- <property name="changed" type="long" not-null="false"/>
- </class>
-
-
- <class name="ggc.core.db.hibernate.food.MealGroupH" table="meal_group">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255"/>
- <property name="name_i18n" type="string" length="255"/>
- <property name="description" type="string" length="2000"/>
- <property name="parent_id" type="long"/>
- <property name="changed" type="long" not-null="false"/>
- </class>
-
- <class name="ggc.core.db.hibernate.food.MealH" table="meal_meal">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="group_id" type="long"/>
- <property name="name" type="string" length="255"/>
- <property name="name_i18n" type="string" length="255"/>
- <property name="description" type="string" length="2000"/>
- <property name="parts" type="text"/>
- <!-- 1:x=1.0;2:y;1:z -->
- <!-- type:id type=[1=Nutrition USDBA, 2=Nutrition User ]; id = id in db -->
- <property name="nutritions" type="text"/>
- <property name="extended" type="text"/>
- <property name="comment" type="string" length="2000"/>
- <property name="changed" type="long" not-null="false"/>
- </class>
-
-</hibernate-mapping>
Deleted: trunk/ggc-core-app/ggc-core/src/GGC_Other.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_Other.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/src/GGC_Other.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping>
-
- <!-- ***************** ggc::Other SCHEMA ******************* -->
-
- <class name="ggc.core.db.hibernate.inet.InetGroupH" table="inet_group">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="parent" type="string" length="255"/>
-
- <property name="name" type="string" length="255"/>
- <property name="name_i18n" type="string" length="255"/>
- <property name="description" type="string" length="2000"/>
- <property name="comment" type="string" length="2000"/>
- </class>
-
-
- <class name="ggc.core.db.hibernate.inet.InetTypeH" table="inet_type">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255"/>
- <property name="name_i18n" type="string" length="255"/>
- <property name="description" type="string" length="2000"/>
- <property name="comment" type="string" length="2000"/>
- </class>
-
- <class name="ggc.core.db.hibernate.inet.InetLinkGroupH" table="inet_link_group">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="group_id" type="string" length="1000"/>
- <property name="link_id" type="string" length="1000"/>
- </class>
-
- <class name="ggc.core.db.hibernate.inet.InetLinkH" table="inet_link">
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="1000"/>
- <property name="description" type="string" length="2000"/>
- <property name="comment" type="string" length="2000"/>
- </class>
-
-
-</hibernate-mapping>
Deleted: trunk/ggc-core-app/ggc-core/src/GGC_Pump.hbm.xml
===================================================================
--- trunk/ggc-core/src/GGC_Pump.hbm.xml 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/src/GGC_Pump.hbm.xml 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping>
-
- <!-- ***************** ggc::Pump SCHEMA ******************* -->
-
-
- <!-- Pump Data -->
- <class name="ggc.core.db.hibernate.pump.PumpDataH" table="pump_data" >
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="dt_info" type="long" not-null="true"/>
- <property name="base_type" type="int" />
- <property name="sub_type" type="int" />
- <property name="value" type="string" length="2000" />
- <property name="extended" type="text" />
- <property name="person_id" type="int" not-null="true" />
- <property name="comment" type="string" length="2000" />
- <property name="changed" type="long" not-null="false" />
- </class>
-
- <!-- Pump Data Additional Info-->
- <class name="ggc.core.db.hibernate.pump.PumpDataExtendedH" table="pump_data_ext" >
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="dt_info" type="long" not-null="true"/>
- <property name="type" type="int" />
- <property name="value" type="string" length="2000" />
- <property name="extended" type="text" />
- <property name="person_id" type="int" not-null="true" />
- <property name="comment" type="string" length="2000" />
- <property name="changed" type="long" not-null="false" />
- </class>
-
- <!-- Pump Profile -->
- <class name="ggc.core.db.hibernate.pump.PumpProfileH" table="pump_profile" >
- <id name="id" type="long" unsaved-value="0">
- <generator class="org.hibernate.id.AssignedIncrementGenerator"/>
- </id>
- <property name="name" type="string" length="255" />
- <property name="basal_base" type="float" />
- <property name="basal_diffs" type="text" />
- <property name="active_from" type="long" />
- <property name="active_till" type="long" />
- <property name="extended" type="text" />
- <property name="person_id" type="int" not-null="true" />
- <property name="comment" type="string" length="2000" />
- <property name="changed" type="long" not-null="false" />
- </class>
-
-
-</hibernate-mapping>
Deleted: trunk/ggc-core-app/ggc-core/src/GGC_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_de.properties 2016-12-25 13:33:49 UTC (rev 1419)
+++ trunk/ggc-core-app/ggc-core/src/GGC_de.properties 2016-12-25 13:55:31 UTC (rev 1421)
@@ -1,843 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 0.5 ###
-# ### Last change: 02.05.2013 11:05:20 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 648
-# Not translated: 96 (15 %)
-# Need to be checked: 110 (17 %)
-#
-# Translated: 442 (68 %)
-#
-#
-#
-## GGC Core#
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# GGC - Globally used [1]
-#
-DELETE=L\u00F6schen
-ADD=Hinzuf\u00FCgen
-EDIT=Bearbeiten
-NEW=Neu
-EDIT_DEL_SHORT=Bearb./L\u00F6schen
-FEATURE=Feature
-IMPLEMENTED_VERSION=wird in Version %s implementiert
-OR=oder
-INFORMATION=Information
-QUESTION=Frage
-YES=Ja
-NO=Nein
-COMMING_IN_VERSION=Kommt in Version %s
-NOT_WORKING_100PRO=Funktioniert noch nicht zu 100%
-NOT_TESTED_100PRO=Noch nicht zu 100% getestet
-NOT_USED=Nicht verwendet
-
-#
-# ggc.datamodels [1]
-#
-NO_NAME=Kein Name
-TIME=Zeit
-BG=BZ
-INS_1=Ins1
-INS_2=Ins2
-INS_3=Ins3
-INSULIN_1=Insulin 1
-INSULIN_2=Insulin 2
-INSULIN_3=Insulin 3
-BU=KH
-ACT=Ac.
-COMMENT=Kommentar
-DATE_MUST_BE_IN_FORMAT=Datum muss folgendes Format haben
-TIME_MUST_BE_IN_FORMAT=Zeit muss folgendes Format haben
-ERROR_PARSING_DATE=Fehler beim Einlesen des Datums
-DATETIME=Datum/Zeit
-PUMP_INSULIN=Pumpen-Insulin
-
-#
-# Main Frame (Info panels) & Other places [1]
-#
-
-# general
-BG_TARGET=BZ-Ziel
-
-# hba1c
-NO_EXPRESSIVENESS=Keine Aussagekraft
-LITTLE_EXPRESSIVENESS=Geringe Aussagekraft
-STANDARD_EXPRESSIVENESS=Mittlere Aussagekraft
-GOOD_EXPRESSIVENESS=Hohe Aussagekraft
-
-#
-# Daily Values Stats [1]
-#
-
-# main
-CH_LONG=Kohlehydrate
-ACTIVITY=Bewegung
-FOOD=Lebensmittel
-UPDATE_FROM_FOOD=KH aktualisieren
-EDIT_FOOD=Lebensmittel Db [1]
-DATE_TIME=Datum/Zeit
-FOOD_SET=Lebensmittelgruppe [%s]
-
-# meals
-FOOD_BY_DESCRIPTION=Beschreibung [2]
-FOOD_BY_DESCRIPTION_TITLE=Nahrungsmittel nach Beschreibung
-DESCRIBE_FOODS=<html><b>Beschreiben Sie Nahrungsmittel, die Sie gegessen haben</b> (wenn Sie KH in eckige Klammern [] einschließen, künnen KH automatisch errechnet werden)</html>
-CALCULATE=Berechnen
-NO_DESCRIPTIONS_WITH_CH=Es wurden keine Beschreibungen mit KH-Definitionen\nim Nahrungsbeschreibungsbereich gefunden.\nSollten Sie einen Fehler gemacht haben,\nbearbeiten Sie den Text noch einmal.\n
-CH=KH
-
-#
-# Main GUI Panels [1]
-#
-ADD_ROW=Neuer Eintrag
-EDIT_ROW=Eintrag \u00E4ndern
-CLOSE=Schlie\u00DFen
-COURSE_GRAPH=Verlaufsdiagramm
-SPREAD_GRAPH=Spread Graph
-TO_BE_DRAWN=Einzuzeichnen
-CONNECT_VALUES_FOR_ONE_DAY=Werte eines Tages verbinden
-SUM_BU=Summe KH
-SUM=Summe
-SUM_INSULIN=Summe IE
-AVG_BG_PER_DAY=mittlerer BZ pro Tag
-INS_PER_DAY=Ins. pro Tag
-MEALS=Mahlzeiten
-INS_SLASH_BU=Ins/KH
-DRAW=Zeichnen
-DAILYGRAPHFRAME=Tagesdiagramm
-DAILYSTATSFRAME=Tagesstatistiken
-SAVE=Speichern
-DELETE_ROW=Eintrag L\u00F6schen
-LOWEST=Niedrigster
-STD_DEV=Std. Abw.
-READINGS=Werte
-HIGHEST=H\u00F6chster
-AVG_BG=Mittl. BZ
-BLOOD_GLUCOSE=Blutzucker
-BREAD_UNITS=Broteinheiten
-AVG=Mittl.
-INSULIN=Insulin
-URINE=Urin
-DOSE=Dosis
-TOTAL=Summe
-AVG_INS=Mittl. IE
-DOSE_INS=Insulindosis
-CANCEL=Abbrechen
-OK=OK
-HELP=Hilfe
-ADD_NEW_VALUES=Neue Werte eintragen
-COURSEGRAPHFRAME=Verlaufsdiagramm
-FREQGRAPHFRAME=Frequenzdiagramm
-GRAPH=Diagramm
-ADD_NEW_ROW_TO_TABLE=F\u00FCgt eine neue Wertereihe in die Tabelle ein.
-DELETE_SELECTED_ROWS=L\u00F6sche ausgew\u00E4hlte Zeilen.
-SELECT_ROW_FIRST=Bitte zuerst einen Eintrag ausw\u00E4hlen!
-READINGS_SLASH_DAY=Werte/Tag
-VALUATION=Wertung
-INIT=Initialisierung
-READY=Fertig
-UNKNOWN=Unbekannt
-COMMENTS=Anmerkungen
-ARE_YOU_SURE_DELETE=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
-ARE_YOU_SURE_DELETE_ROW=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
-
-#
-# GGC Little (GUI) [2]
-#
-DAILY_VALUES=Tageswerte
-SHOW_DAILY_GRAPH=Diagramm anzeigen
-DAILY_CONTROL=Daily Control
-MN_QUIT_LT_DESC=GGC Little beenden
-CURRENT_DATE_HAS_CHANGED=Das Datum hat sich ge\u00E4ndert! Ihre Aktion wird deshalb verworfen und die Tabelle aktualisiert!
-TB_ADD_ROW_DESC=Neuer Eintrag f\u00FCr diesen Tag
-TB_EDIT_ROW_DESC=Eintrag f\u00FCr diesen Tag bearbeiten
-TB_DELETE_ROW_DESC=Eintrag f\u00FCr diesen Tag l\u00F6schen
-TB_READ_METER_LT_DESC=Daten vom Me\u00DFger\u00E4t auslesen
-TB_ABOUT_DESC=\u00DCber GGC Little
-TB_SHOW_GRAPH_DESC=Diagramm f\u00FCr diesen Tag anzeigen
-GGC_LITTLE_TITLE=GNU Gluco Control Little
-TAB_CONTROL=Steuerung
-TAB_SCHEDULE=Terminplan
-TAB_PLUGIN=Plug-ins
-TAB_STOCKS=Bestand
-PLUGIN_IMPLEMENTED_VERSION=Dieses Plug-in wird in Version %s implementiert!
-METER_PLUGIN_PANEL=Me\u00DFger\u00E4te-Plug-in
-PUMP_PLUGIN_PANEL=Pumpen-Plug-in
-
-#
-# GGC Little (System Tray) [3]
-#
-SHOW_APP=Anzeigen
-SHOW_APP_DESC=GGC Little anzeigen
-HIDE_APP=Verstecken
-HIDE_APP_DESC=GGC Little verstecken
-EXIT_APP=Beenden
-EXIT_APP_DESC=GGC Little beenden
-
-#
-# Menus (BE CAREFUL about mnemonics used) Set mnemonic with & before mnemonic letter [1]
-#
-
-# main menus
-MN_FILE=&Datei
-MN_DATA=Pen/Spritze
-MN_DATA_GRAPH=Diagramme
-MN_DOCTOR=&Arzt
-MN_FOOD=&Ern\u00E4hrung
-MN_PRINTING=D&rucken
-MN_TOOLS=&Werkzeuge
-MN_HELP=&Hilfe
-
-# file
-MN_LOGIN=Ein&loggen
-MN_LOGIN_DESC=Patient einloggen
-MN_LOGOUT=Ausl&oggen
-MN_LOGOUT_DESC=Ausloggen
-MN_QUIT=B&eenden
-MN_QUIT_DESC=GGC beenden
-
-# data
-MN_DAILY=&Tages\u00FCbersicht
-MN_DAILY_DESC=Tagesstatistik betrachten
-MN_COURSE=&Verlauf
-MN_COURSE_DESC=Verlauf betrachten
-MN_SPREAD=Ver&teilung
-MN_SPREAD_DESC=Verteilung betrachten
-MN_FREQUENCY=&Frequenz
-MN_FREQUENCY_DESC=Wertefrequenz betrachten
-MN_HBA1C=&HbA1c
-MN_HBA1C_DESC=HbA1c betrachten
-MN_DATA_RATIO=Verh\u00E4ltnis
-MN_DATA_RATIO_DESC=Verh\u00E4ltnis-Einstellungen
-MN_RATIO_BASE=Basis
-MN_RATIO_BASE_DESC=Basisverh\u00E4ltniseinstellungen (1 pro Tag)
-MN_RATIO_EXTENDED=Erweitert
-MN_RATIO_EXTENDED_DESC=Erweiterte Verh\u00E4ltniseinstellungen (mehr als 1 pro Tag)
-MN_RATIO_CALC=&Verh\u00E4ltnisrechner
-MN_RATIO_CALC_DESC=Berechnet verschiedene Verh\u00E4ltnisse (Insulin/KH, ...)
-
-# tools
-MN_DB_MAINT=&Datenbank-Wartung
-MN_DB_MAINT_DESC=Funktionen f\u00FCr die Wartung der Datenbank
-MN_DB_BACKUP=Datenbank &sichern
-MN_DB_BACKUP_DESC=Sichert die GGC-Datenbank
-MN_DB_RESTORE=Datenbank &wiederherstellen
-MN_DB_RESTORE_DESC=Stellt die GGC-Datenbank anhand einer Sicherung wieder her
-MN_MISC_SYNCHRONIZE=&Synchronisierung
-MN_MISC_SYNCHRONIZE_DESC=Datenabgleich mit anderen GGC Instanzen
-MN_PREFERENCES=&Einstellungen
-MN_PREFERENCES_DESC=Einstellungen
-
-# help
-MN_ABOUT=\u00DC&ber
-MN_ABOUT_DESC=\u00DCber GGC
-MN_CHECK_FOR_UPDATE=Nach &Updates suchen
-MN_CHECK_FOR_UPDATE_DESC=Pr\u00FCft, ob eine neue Version verf\u00FCgbar ist
-
-# food
-MN_NUTRDB_USDB=N\u00E4hrstoff-DB (&USDA)
-MN_NUTRDB_USDB_DESC=Datenbank mit N\u00E4hrstoff-Informationen, ver\u00F6ffentlicht vom USDA
-MN_NUTRDB_USER=N\u00E4hrstoff-DB (&Benutzer)
-MN_NUTRDB_USER_DESC=N\u00E4hrstoff-Datenbank des Benutzers
-MN_MEALS=&Mahlzeiten-DB
-MN_MEALS_DESC=Datenbank mit vollst\u00E4ndigen Mahlzeiten
-
-# printing
-MN_REPORTS=&Data
-MN_REPORTS_DESC=Selbstkontrolldaten-Berichte
-MN_PDF_SIMPLE=&Einfach
-MN_PDF_SIMPLE_DESC=Einfacher PDF-Bericht (monatl.)
-MN_PDF_EXT=&Ausf\u00FChrlich
-MN_PDF_EXT_DESC=Ausf\u00FChrlicher PDF-Bericht (monatl.)
-
-# doctors
-MN_DOCS=\u00C4&rzte
-MN_DOCS_DESC=\u00C4rzte
-MN_APPOINT=&Termine
-MN_APPOINT_DESC=Termine f\u00FCr Arztbesuche
-MN_STOCKS=&Bestand
-MN_STOCKS_DESC=Bestand medizinischer Ausr\u00FCstung
-
-#
-# ggc.gui.calendar [2]
-#
-ENDING_DATE=Enddatum
-STARTING_DATE=Startdatum
-1_WEEK=1 Woche
-1_MONTH=1 Monat
-3_MONTHS=3 Monate
-CUSTOM=Benutzerdefiniert
-DATE_RANGE_SELECTOR=Wahl des Zeitraumes
-SU=So
-MO=Mo
-TU=Di
-WE=Mi
-TH=Do
-FR=Fr
-SA=Sa
-JANUARY=Januar
-FEBRUARY=Februar
-MARCH=M\u00E4rz
-APRIL=April
-MAY=Mai
-JUNE=Juni
-JULY=Juli
-AUGUST=August
-SEPTEMBER=September
-OCTOBER=Oktober
-NOVEMBER=November
-DECEMBER=Dezember
-
-#
-# Main GUI Panels [1]
-#
-GENERAL_INFORMATION=Allgemeine Informationen
-YOUR_NAME=Ihr Name
-BOLUS_INSULIN=Bolusinsulin
-BASAL_INSULIN=Basalinsulin
-GLUCOMETER=Messger\u00E4t
-BG_UNIT=Ma\u00DFeinheit
-HBA1C=HbA1c
-YOUR_CURRENT_HBA1C=Ihr aktueller HbA1c
-NO_READINGS=Keine Werte
-NO_DATASOURCE=Keine Datenquelle
-SCHEDULE=Terminplan
-YOUR_NEXT_APPOINTMENT=Ihr n\u00E4chster Termin
-APP_WILL_BE_FOUND_HERE=wird hier zu finden sein...
-STATISTICS_FOR_LAST_WEEK=Statistiken f\u00FCr vorige Woche
-BG_STATISTICS=BZ Statistiken
-BU_STATISTICS=KH Statistiken
-BU_PER_DAY=KH pro Tag
-AVG_MEAL_SIZE=KH pro Mahlzeit
-MEALS_PER_DAY=Mahlzeiten pro Tag
-STATISTICS=Statistiken
-PER_DAY=pro Tag
-AVG_DOSE_SIZE=Mittl. Dosis
-DOSES_PER_DAY=Dosen pro Tag
-OTHER_INFO=Sonstiges
-STOCK=Bestand
-STOCK_DATA_HERE=Daten zu Ihrer medizinischen Ausr\u00FCstung
-STO_WILL_BE_FOUND_HERE=wird hier zu finden sein...
-NOT_YET=BISHER NOCH NICHT!
-BOLUS_INSULIN_SHORT=Bolus
-BASAL_INSULIN_SHORT=Basal
-AVERAGE=Durchschnitt
-DOSES=Dosen
-
-#
-# Hba1c Dialog [1]
-#
-CALCULATED_HBA1C=Errechneter HbA1c
-
-#
-# Configuration [1]
-#
-APPLY=Anwenden
-ERROR=Fehler
-INVALID_NAME=Ung\u00FCltiger Name
-PREFERENCES=Einstellungen
-GENERAL=Allgemeines
-MEDICAL_DATA=Medizinische Daten
-COLORS_AND_FONTS=Farbe & Schrift
-RENDERING_QUALITY=Darstellungsqualit\u00E4t
-SOME_VALUES_CHANGED_LIKE_TO_SAVE=Einige Werte haben sich ge\u00E4ndert. Wollen Sie diese speichen?
-VALUES_CHANGED=Ge\u00E4nderte Werte
-CHOOSE_A_COLOR=W\u00E4hlen Sie eine Farbe
-BG_HIGH_ZONE=\u00DCberzuckerbereich
-BG_TARGET_ZONE=Zielbereich
-BG_LOW_ZONE=Unterzuckerbereich
-BG_AVERAGE=BZ Mittelwert
-INS_SLASH_BU_QUOTIENT=Ins/KH
-NAME=Name
-ABBR=Abk.
-HIGH_BG=\u00DCberzuckergrenze
-LOW_BG=Unterzuckergrenze
-TARGET_HIGH_BG=Obergrenze Zielbereich
-TARGET_LOW_BG=Untergrenze Zielbereich
-INSULIN_SETTINGS=Insulineinstellungen
-BLOOD_GLUCOSE_SETTINGS=Blutzuckereinstellungen
-BLOOD_GLUCOSE_UNIT_SETTING=BZ-Einheiteneinstellungen
-BLOOD_GLUCOSE_SETTINGS_1=BZ-Einstellungen (mg/dl)
-BLOOD_GLUCOSE_SETTINGS_2=BZ-Einstellungen (mmol/l)
-HOST=Host
-PORT=Port
-USERNAME=Benutzername
-PASSWORD=Passwort
-OPTIONS=Optionen
-ANTIALIASING=Kantengl\u00E4ttung
-COLOR_RENDERING=Farbdarstellung
-DITHERING=Dithering
-FRACTIONAL_METRICS=Fractional Metrics
-INTERPOLATION=Interpolation
-TEXT_ANTIALIASING=Kantengl\u00E4ttung Schrift
-RENDERING=Darstellung
-DE=Deutsch
-EN=Englisch
-SI=Slowenisch
-YOUR_LANGUAGE=Ihre Sprache
-COLOR_SCHEME_SELECT=Farbschemawahl
-SELECTED_COLOR_SCHEME=Gew\u00E4hltes Farbschema
-NEW_SCHEME=Neues Schema
-COLORS=Farben
-COLOR_SCHEME_PREDEFINED=Die Farbe eines vordefinierten Farbschemas kann nicht ver\u00E4ndert werden.
-USE_AS_TEMPLATE=Folgendes Schema als Vorlage benutzen
-CREATE_NEW_SCHEME=Neues Schema erstellen
-EDIT_DELETE_SCHEME=Schema Bearbeiten/L\u00F6schen
-TYPE_NAME_BEFORE=Geben Sie den Name ein und klicken Sie OK.
-SCHEME_NAME_ALREADY_USED=Dieses Schema existiert bereits!\nBitte w\u00E4hlen Sie einen anderen Namen.
-PREDEFINED_SCHEME_CANT_BE_CHANGED=Der Name eines vordefinierten Schemas kann nicht ge\u00E4ndert, und das Schema nicht gel\u00F6scht werden!
-EXECUTABLE_FILES=Ausf\u00FChrbare Dateien (*.exe)
-SELECT_PDF_VIEWER=Wahl des PDF-Betrachters
-COLOR_PREVIEW=Farbschema Vorschau
-ACTION=Aktion
-ACTION_DELETE=L\u00F6schen
-ACTION_EDIT=Bearbeiten
-SELECTED_SCHEME=Aktives Schema
-NEW_NAME=Neuer Name
-SELECT_ACTION_OR_CANCEL=Sie sollten eine Aktion oder 'Abbrechen' w\u00E4hlen
-GENERAL_SETTINGS=Allgemeine Einstellungen
-DATABASE_SETTINGS=Datenbank
-DATABASE_SETTINGS_DESC=<html><body><b><i>Warnung! \u00C4ndern Sie diese Einstellung nur wenn Sie wissen, was Sie tun!</i></b><br>Die meisten Daten und Einstellungen befinden sich in der Datenbank selbst. In der Konfigurationsdatei befinden sich nur Einstellungen zu Sprache, Datenbank und Look&Feel.<br><i>\u00C4nderungen werden sich erst nach einem Neustart auswirken.</i></body></html>
-SELECTED_DATABASE=Gew\u00E4hlte Datenbank
-LAF_SETTINGS=Look & Feel Einstellungen
-LAF_SETTINGS_DESC=<html><body><i>\u00C4nderungen werden sich erst nach einem Neustart von GGC auswirken.</i></body></html>
-SELECTED_LAF_TYPE_NAME=L&F w\u00E4hlen (Name)
-SELECTED_LAF_TYPE_CLASS=L&F w\u00E4hlen (Klasse)
-SELECTED_SKINLF_DEF=Gew\u00E4hlter Skin f\u00FCr SkinLF
-SELECT_SKINLF_SKIN=W\u00E4hlen Sie eine Oberfl\u00E4che f\u00FCr die Skin L&F-Bibliothek
-SELECT=Ausw\u00E4hlen...
-BASIC_SETTINGS=Grundeinstellungen
-EMPTY_VALUE=Leerer Wert
-PDF_VIEWER_SETTINGS=PDF-Betrachter Einstellungen
-PDF_VIEWER=PDF-Betrachter
-BROWSE=Ausw\u00E4hlen...
-LUNCH_START_TIME=Mittagszeit ab (hh:mm)
-DINNER_START_TIME=Abendszeit ab (hh:mm)
-NIGHT_START_TIME=Nacht ab (hh:mm)
-
-# Mode
-MODE=Modus
-APPLICATION_MODE=Anwendungsmodus
-PEN_INJECTION_MODE=Pen-/Spritzen-Modus
-PUMP_MODE=Pumpenmodus
-APPLICATION_MODE_DESC=<html><body>Der Modus unterbindet nicht die Verwendung von Teilen der Anwendung. Er w\u00E4hlt nur die richtigen Daten f\u00FCr die Anzeige der Statistiken und die richtigen Symbole f\u00FCr die Toolbar aus.</body></html>
-PEN_INJECTION_MODE_SETTINGS=Pen-/-Spritzmodus Einstellungen
-PUMP_MODE_SETTINGS=Pumpenmodus Einstellungen
-BASAL_PRECISSION=Basaldosis Genauigkeit
-BOLUS_PRECISSION=Bolusdosis Genauigkeit
-MAX_BASAL=Max. Basaldosis
-MAX_BOLUS=Max. Bolusdosis
-TBR_TYPE_SELECTOR=Tempor\u00E4rer Basalratentyp
-TBR_TYPE_BOTH=Beide
-TBR_TYPE_UNIT=Einheit (U)
-TBR_TYPE_PROC=Prozent (%)
-TBR_TYPE_CHOICE=Choice in GGC
-PROCENT_MIN=Prozent Min.
-UNIT_MIN=Einheit Min.
-TASK_MIN=Min
-TASK_MAX=Max
-TASK_STEP=Schritt
-
-# Language
-LANGUAGE=Sprache
-LANGPACK_VERSION=Sprachpaket
-LANG_WITH_HELP=Sprachen mit Hilfe
-LANG_WITHOUT_HELP=Sprachen ohne Hilfe
-SELECT_LANGUAGE=Sprachwahl
-NO_HELP_AVAILABLE=Keine Hilfe verf\u00FCgbar
-HELP_AVAILABLE=Hilfe verf\u00FCgbar
-LANG_DESC=<html><body>Die Übersetzung der Anwendung findet getrennt von deren Entwicklung statt, weshalb die Übersetzung meistens etwas veraltet ist. Übersetzungen werden vor allem von Freiwilligen außerhalb des Projekts gepflegt, deshalb sind wir nicht direkt für Fehler in der Übersetzung, oder wann die n\u00E4chste Übersetzung verfügbar ist verantwortlich. Wenn Sie Fehler finden, können Sie uns gerne kontaktieren und wir werden sie baldmöglichst beheben.<br>Wenn etwas noch nicht übersetzt wurde, wird der Ausdruck in der Standardsprache (Englisch) angezeigt.<br>Wenn Sie bei der Übersetzung helfen wollen, kontaktieren Sie uns bitte via E-Maill: gg...@at....</body></html>
-NOTE_RESTART=<html><body><b>Warnung:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html>
-NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><b>Warnung:</b>Dieses Feature ist noch nicht aktiviert. Bis auf weiteres verwenden Sie bitte die Sprachwahl im Allgemeines-Reiter. Wenn dieses Feature aktiviert wird, wird diese Warnung und die Sprachwahl im Allgemeines-Reiter entfernt.</font></body></html>
-
-#
-# ggc.util [6]
-#
-UNNAMED_USER=Unbekannter Benutzer
-THIS_FILE_WAS_AUTOMATICALY_GENERATED=Diese Datei wurde automatisch generiert.
-YOUR_VERSION=Ihre Version
-AVAILABLE_VERSION=Verf\u00FCgbare Version
-NO_NEW_VERSION=Keine aktuellere Version verf\u00FCgbar.
-CHECK_FOR_NEW_VERSION=Auf neue Version \u00FCberpr\u00FCfen
-HOST_UNAVAILABLE_INFO=Server nicht verf\u00FCgbar
-HOST_UNAVAILABLE_MSG=Konnte nicht mit ggc.sourceforge.net verbinden!
-
-#
-# Graphs [2]
-#
-DAYS_WITH_READINGS_0_1=Tage mit 0 oder 1 Messung
-DAYS_WITH_READINGS_2_3=Tage mit 2 oder 3 Messungen
-DAYS_WITH_READINGS_4_5=Tage mit 4 oder 5 Messungen
-DAYS_WITH_READINGS_6_7=Tage mit 6 oder 7 Messungen
-DAYS_WITH_READINGS_MORE_7=Tage mit 8+ Messungen
-AXIS_TIME_LABEL=Zeit (Std)
-AXIS_VALUE_LABEL=BZ (%s)
-FORMAT_DATE_DAYS=dd.MM.yyyy
-FORMAT_DATE_HOURS=HH:mm
-GRAPH_NO_DATA_AVAILABLE_CHANGE=Keine Daten verf\u00FCgbar. W\u00E4hlen Sie eine andere Zeitspanne und/oder zu zeichnende Elemente und klicken Sie "Zeichnen"!
-
-#
-# Database Tool [5]
-#
-DB_TOOL=Database Hibernate Tool
-DB_CONFIGURATION=Datenbankeinstellungen
-DB_PRESS_HELP=Klicken Sie auf den Hilfe-Knopf um detaillierte Informationen zu den Verbindungseinstellungen zu bekommen.
-DB_CONFIG_DESC=<html><head></head><body><p>Dieses Tool ist daf\u00FCr da, Ihre Datenbank f\u00FCr diese Anwendung zu konfigurieren. Bitte setzen Sie alle Einstellungsmöglichkeiten korrekt und versuchen Sie dann, eine Verbindung mit der Datenbank herzustellen (Benutzername, Passwort und Datenbank Name müssen korrekt sein). Ist der Verbindungsversuch erfolgreich, stimmen die Einstellungen.</p><p>Jetzt sind Sie bereit, Tabellen mit Hilfe von Hibernate zu erstellen.. Sie müssen alle JARs zum Classpath hinzufügen, bevor Sie die zweite Option (Datenbank initialisieren) starten. Sie müssen vorsichtig sein! Wenn Sie die Datenbank bereits eingerichtet und mit Daten befüllt haben, wird "Datenbank initialisieren" alle Daten zerstören.<p><body><html>
-DATABASE_TYPE=DB-Typ
-DATABASE_CLASSNAME=DB-Klasse
-HIBERNATE_DIALECT=Hibernate Dialekt
-JDBC_URL=JDBC URL
-HOSTNAME=Hostname
-DATABASE=Datenbank
-
-#
-# Printing - Base [2]
-#
-PRINTING=Drucken
-TYPE_OF_REPORT=Berichttyp
-SELECT_YEAR_AND_MONTH=Monat w\u00E4hlen
-REPORT_FOOTER=Dieser Bericht stammt von "GGC - GNU Gluco Control", frei verf\u00FCgbar unter http://ggc.sourceforge.net
-FOR=F\u00FCr
-PRINTING_SETTINGS_NOT_SET=<html>Druckeinstellungen (PDF-Anzeigeprogramm) nicht gesetzt oder inkorrekt.</html>
-PRINTING_SETTINGS_NOT_SET_SOL=<html>Gehen Sie zu Werkzeuge->Einstellungen->Drucken<br>und geben Sie den Pfad zum PDF-Anzeigeprogramm an.</html>
-PDF_VIEVER_RUN_ERROR=<html>Fehler beim Aufruf des PDF-Anzeigeprogramms:<br>Unbekannter Fehler</html>
-SELECT_STARTING_RANGE=Select starting range
-SELECT_ENDING_RANGE=Select ending range
-
-#
-# Printing [2]
-#
-INS_SHORT=Ins
-CH_SHORT=KH
-BREAKFAST=Fr\u00FChst\u00FCck
-LUNCH=Mittagessen
-DINNER=Abendessen
-NIGHT=Nacht
-SIMPLE_MONTHLY_REPORT=Einfacher Bericht (monatl.)
-EXTENDED_MONTHLY_REPORT=Ausf\u00FChrlicher Bericht (monatl.)
-FOOD_MENU_BASE=Food Menu Base (CH only)
-FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
-FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
-FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
-
-#
-# Stocks [5]
-#
-STOCKS=Bestand
-
-#
-# Appointments [5]
-#
-APPOINTMENTS=Arzttermine
-
-#
-# About [1]
-#
-SYSTEM_PROPERTIES=Systemeigenschaften
-ABOUT=\u00DCber
-PROPERTY=Eigenschaft
-VALUE=Wert
-LICENCE=Lizenz:
-CREDITS=Mitwirkende
-LIBRARIES=Bibliotheken
-MAIN=Main
-ABOUT_GGC=\u00DCber GNU Gluco Control
-GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam
-SEE_CREDITS=(siehe Mitwirkende)
-GGC_TITLE=GNU Gluco Control
-CURRENT_DEVELOPERS=Aktive Entwickler
-PREVIOUS_DEVELOPERS=Ehemalige Entwickler
-
-#
-# Doctor types [5]
-#
-ADDICTION_MEDICINE=Addiction Medicine
-ADOLESCENT_MEDICINE=Adolescent Medicine
-AIDS_HIV_CARE=AIDS/HIV Care
-ANESTHESIOLOGY=Anesthesiology
-ASTHMA_ALLERGY_IMMUNOLOGY=Asthma, Allergy & Immunology
-BREAST_CANCER_SURGERY=Brustkrebschirurgie
-CARDIAC_SURGERY=Herzchirurgie
-CHILD_CARE=Child care (pediatrics)
-CARDIOLOGY=Kardiologie
-COLORECTAL_SURGERY=Colorectal Surgery
-COSMETIC_SURGERY=Cosmetic Surgery
-CRITICAL_CARE=Critical Care
-DENTAL_SPECIALTIES=Dental Specialties
-DERMATOLOGY=Dermatologie
-DIABETES=Diabetes
-EMERGENCY_MEDICINE=Emergency Medicine
-ENDOCRINOLOGY=Endokrinologie
-EPILEPSY=Epilepsie
-FAMILY_MEDICINE=Family Medicine
-GASTROENTEROLOGY=Gastroenterologie
-GENERAL_SURGERY=Allgemeine Chirurgie
-GENERAL_INTERNAL_MEDICINE=General Internal Medicine
-GERIATRICS=Geriatrics
-GYNECOLOGIC_ONCOLOGY=Gyn\u00E4kologische Onkologie
-GYNECOLOGY=Gyn\u00E4kologie
-HAND_SURGERY=Hand Surgery
-HEAD_AND_NECK_SURGERY=Head and Neck Surgery
-HEADACHE=Headache
-HEMATOLOGY=H\u00E4matologie
-HOSPITAL_INTERNAL_MEDICINE=Hospital Internal Medicine
-INFECTIOUS_DISEASES=Infectious Diseases
-INFERTILITY_MEDICINE=Infertility Medicine
-INTERNAL_MEDICINE=Internal Medicine
-LABORATORY_MEDICINE=Laboratory Medicine
-MIDWIFE=Midwife (CNM)
-MEDICAL_GENETICS=Medical Genetics
-METABOLISM=Stoffwechsel
-MOVEMENT_DISORDERS=Movement Disorders
-NEONATOLOGY=Neonatology
-NEPHROLOGY=Nephrologie
-NEUROLOGY=Neurologie
-NEURO_OPTHALMOLOGY=Neuro-ophthalmology
-NEUROSURGERY=Neurochirurgie
-NUCLEAR_MEDICINE=Nuclear Medicine
-NUTRITION_MEDICINE=Nutrition Medicine
-OBSTETRICS_AND_GYNECOLOGY=Geburtshilfe und Gyn\u00E4kologie
-ONCOLOGY_MEDICAL=Oncology Medical
-ONCOLOGY_RADIATION=Oncology Radiation
-OPTHALMOLOGY=Augenheilkunde
-ORAL_MAXILLOFACIAL_SURGERY=Oral/Maxillofacial Surgery
-ORTHOPEDIC_SURGERY=Orthopedic Surgery
-OTOLARYNGOLOGY=Otolaryngology (ENT)
-OTOLOGY=Otology
-PAIN_MANAGEMENT=Pain Management
-PATHOLOGY=Pathologie
-PEDIATRIC=Kinderheilkunde
-PEDIATRIC_SPECIALISTS=Pediatric Specialists
-PERINATOLOGY=Geburtshilfe
-PHYSIATRY=Physiatry
-PHYSICAL_REHABILITATION=Physical Rehabilitation
-PLASTIC_RECONSTRUCTIVE_SURGERY=Plastic/Reconstructive Surgery
-PODIATRY=Fu\u00DForthop\u00E4die
-PROSTATE_CARE=Prostate Care
-PSYCHIATRY=Psychiatrie
-PSYCHOLOGY=Psychologie
-PULMONARY_MEDICINE=Pulmonary Medicine
-RADIOLOGY=Radiologie
-RADIATION_ONCOLOGY=Radiation Oncology
-REPRODUCTIVE_ENDOCRINOLOGY_INFERTILITY=Reproductive Endocrinology and Infertility
-RHEUMATOLOGY=Rheumatologie
-SLEEP_DISOREDERS=Schlafst\u00F6rungen
-SPORTS_MEDICINE=Sportmedizin
-THORACIC_SURGERY=Thoracic Surgery
-TRANSPLANT=Transplantation
-UROLOGY=Urologie
-VASCULAR_SURGERY=Gef\u00E4\u00DFchirurgie
-
-#
-# Doctor [5]
-#
-DOCTORS=\u00C4rzte
-FILTER=Filter
-FILTER_VISIBLE=Sichtbare
-FILTER_ALL=Alle
-
-#
-# Ratio's: Base [1]
-#
-RATIO_BASE=Grundverh\u00E4ltnis
-INSULIN_CARB_RATIO=Insulin/KH-Verh\u00E4ltnis
-SENSITIVITY_FACTOR_LONG=<html>Empfindlichkeitsfaktor<br>(Insulin/BZ-Verh\u00E4ltnis)</html>
-FILL_RATIO_ENTRIES=<html>Bitte f¨llen Sie die ersten beiden Einträge dieses Formulars aus,<br>oder brechen Sie den Vorgang ab.</html>
-
-#
-# Ratio's: Extended [1]
-#
-RATIO_EXTENDED=Erweitertes Verh\u00E4ltnis
-RATIO_ENTRY_ADD=Neuer Verh\u00E4ltniseintrag
-RATIO_ENTRY_EDIT=Verh\u00E4ltniseintrag bearbeiten
-TIME_FROM=Von
-TIME_TILL=Bis
-PROCENT_OF_BASE=Prozent (der Basis)
-PROCENT_OF_BASE_SHORT=% der Basis
-CH_INSULIN_RATIO_SHORT=KH/Ins
-BG_INSULIN_RATIO_SHORT=BZ/Ins
-BG_OH_RATIO_SHORT=BZ/KH
-CHECK_RATIOEXTENDED_DATA_OK=<html><body>You filled all data about<br>extended ratio's for whole<br>day successfuly !<br></body></html>
-CHECK_RATIOEXTENDED_FAILED=<html><body>You filled data about extended<br>ratio's incorrectly. All minutes<br>of the day must be included (from<br>0:00 till 23:59)!<br></body></html>
-
-#
-# Ratio's: Calculator [4]
-#
-RATIO_CALCULATOR=Verh\u00E4ltnisrechner
-TYPE_SOURCE_DATA=Art der Quelldaten
-TYPE_SOURCE_MANUAL=Manuelle Daten
-TYPE_SOURCE_DB=Datenbank Daten
-TDD_FOR_CALCULATION=Total Daily Dose (TDD) For Calculation
-RATIO_TIME_SELECT_DESC=<html>Sie müssen einen Zeitraum für die Rechnung wählen. Sind Ihre Werte stabil (keine größeren Änderungen), dürfte ein größerer Zeitraum bessere Resultate liefern. Gibt es jedoch größere Änderungen, oder befinden Sie sich mitten in einer Bolus-/Basalratenneueinstellung, sollten Sie einen kleineren Zeitraum wählen.</html>
-2_WEEKS=2 Wochen
-3_WEEKS=3 Wochen
-DB_DATA_STATUS=Db Data Status
-DB_DATA_NOT_READY=Nicht bereit!
-DB_DATA_READY=Bereit
-GET_DATA=Daten abrufen
-RULE_500=500er-Regel (schnellwirkende Insuline)
-RULE_450=450er-Regel (Normalinsuline)
-RULE_300=300er-Regel (kleine Kinder)
-RULE_1800=1800er-Regel (schnellwirkende Insuline)
-RULE_1500=1500er-Regel (Normalinsuline)
-SELECT_RANGE=Zeitraum w\u00E4hlen
-SELECT_RULE=Regel w\u00E4hlen
-SENSITIVITY_FACTOR=Empfindlichkeitsfaktor
-CALCULATION=Rechnung
-INS_CH_RATIO_PROC=1E Insulin f\u00FCr %s g KH
-INS_BG_RATIO=Ins/BZ-Verh\u00E4ltnis
-INS_BG_RATIO_PROC=1E Insulin verringert den BZ um %s %s
-CH_BG_RATIO=KH/BZ-Verh\u00E4ltnis
-CH_BG_RATIO_PROC=1 %s Zunahme f\u00FCr %s g KH
-TDD_MUST_BE_GREATER_THAN_ZERO=<html><body>Total Daily Dose (TDD) must be greater than<br>zero. Recheck the value and start calculation<br>again.</body></html>
-RATIO_CALCULATOR_NOT_IMPLEMENTED=<html><body>This part of Ratio Calculator not implemented<br>yet.</body></html>
-RATIOS_NOT_DONE=<html><body>You never run calculation of Ratio's.<br>Either run it and click OK to transfer<br>calculated data, or use Cancel to exit.</body></html>
-RATIO_DB_IMPORT_NA=<html><body>Importing data from Db, doesn't work yet.<br>You can only enter data manually.</body></html>
-
-#
-# Bolus Helper [1]
-#
-BOLUS_HELPER=Bolus Helper
-READ_RATIOS=Read Ratios
-CH_INSULIN_RATIO=CH / Insulin Ratio
-BG_INSULIN_RATIO=BG / Insulin Ratio
-BG_OH_RATIO=BG / CH Ratio
-CORRECTION_DOSE=Correction Dose
-CARB_DOSE=Dose for covering CH
-TOGETHER=Together
-TOGETHER_ROUNDED=Together (rounded)
-NO_BG_MEASURE=No BG measurment.
-NO_CARBS_DEFINED=CH not set.
-UNIT_SHORT=U
-
-#
-# Tools [1]
-#
-METERS_PLUGIN=Messger\u00E4te-Plug-in
-PUMPS_PLUGIN=Pumpen-Plug-in
-CGMS_PLUGIN=CGMS Tool Plug-in
-NUTRITION_PLUGIN=Nutrition Tool Plug-in
-STATUS_NOT_INSTALLED=Nicht installiert
-STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00FCgbar)
-STATUS_INSTALLED=Installiert (Version %s)
-PLUGIN_NOT_INSTALLED_OR_AVAILABLE=%s nicht installiert und/oder verf\u00FCgbar.
-
-#
-# Backup/Restore [1]
-#
-
-# backup
-BACKUP=Sicherung
-BACKUP_DB_TITLE=Sicherung der GGC-Datenbank
-BACKUP_DB_TITLE_SHORT=Datenbanksicherung
-SELECT_ELEMENTS_TO_BACKUP=W\u00E4hlen Sie die zu sichernden Elemente
-
-# progress
-TOTAL_PROGRESS=Fortschritt insgesamt
-BACKUP_NOT_STARTED_YET=Sicherung wurde noch nicht gestartet.
-CURRENT_TASK=Aktuelle Aufgabe
-NO_TASK_STARTED=Keine Aufgabe
-
-# elements
-GGC_BACKUP=GGC-Sicherung
-NUTRITION_OBJECTS=Nahrungsobjekte
-USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
-MEAL_GROUPS=Mahlzeit-Gruppen
-FOODS=Ern\u00E4hrung
-TASK=Aufgabe
-SETTINGS=Einstellungen
-CONFIGURATION=Configuration
-COLOR_SCHEMES=Color Schemes
-
-# restore
-RESTORE_DB_TITLE=Wiederherstellung der GGC-Datenbank
-RESTORE_DB_TITLE_SHORT=Datenbankwiederherstellung
-RESTORE=Wiederherstellen
-RESTORE_NOT_STARTED_YET=Wiederherstellung wurde noch nicht gestarted.
-RESTORE_SELECTOR_DESC=<html>Select file from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html>
-SELECT_ELEMENTS_TO_RESTORE=Elemente zum Wiederherstellen w\u00E4hlen:
-DAILY_VALUES_APPEND=<html>Wollen Sie diese Werte an die vorhandenen Tageswerte anhängen? Falls die Datenbank diese Einträge bereits enthält, könnten diese dadurch dupliziert werden. Neue Einträge werden ohne Vergleich mit bereits existierenden hinzugefügt.</html>
-FILE_FILTER_DBE=*.dbe - Datenbank Export Dateien
-FILE_FILTER_ZIP=*.zip - Archiv (sollte *.dbe enthalten)
-SELECT_FILE_TO_RESTORE=Wiederherzustellende Datei ausw\u00E4hlen
-NEXT_STEP=Weiter
-
-#
-# Update [1]
-#
-LEGEND=Legende
-NEWEST=Neueste Version
-NOT_UPDATED=Nicht aktualisiert
-NOT_UPDATABLE=Nicht aktualisierbar
-UNKNOWN_STATUS=Unbekannter Status
-CHECK_SERVER=Server \u00FCberpr\u00FCfen
-RUN_UPDATE=Aktualisieren!
-CURRENT_VERSION=Aktuelle Version
-SERVER_VERSION=Version auf dem Server
-UPDATEABLE=Aktualisierbarkeit
-UPDATE_APPLICATION=Aktualisierung der Anwendung
-UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html>
-NO_UPDATE_FOUND=No update was found on server!
-UPDATE_FOR_HIGHER_DB_FOUND=<html><body>No update for current database was found !<br>But there is version of application (%s)<br>for higher version of database. Since we<br>don't support update of database yet, we<br>can't continue update.<br></body></html>
-UPDATE_FOUND_VERSION=<html><body>We found update (%s) for your<br>version of database.<br>Do you wish to continue?</body></html>
-UPDATE_FOUND_ALSO_HIGHER_DB=<html><body>We found two updates. One with higher version of<br>database (%s) and other with the same. Since we<br>don't support update of database yet, we can update<br>only to version %s.<br>Do you wish to continue?</body></html>
-STATUS_UPD_FAILED_DATA=Data problem.
-STATUS_UPD_FAILED_COMM_ERROR=Communication failed.
-STATUS_UPD_NO_VALID_UPDATE=No valid update found.
-STATUS_UPD_NO_UPDATE=No update found.
-STATUS_UPD_UPDATE_FOUND=Update found.
-SERVER_STATUS=Server status
-NO_STATUS=No status
-
-#
-# Db Check [1]
-#
-DB_ERROR_ON_LOAD=Fehler beim initialisieren der Datenbank
-DB_HEADER=<html>Das DB-Prüfwerkzeug hat festgestellt, dass Sie eine falsche Datenbankversion verwenden.<br><br>Aktuelle DB-Version: %s<br>Benötigte DB-Version: %s<br><br>%s<html>
-DB_VERSION_LOWER=Die gegenw\u00E4rtige Version ist kleiner als die ben\u00F6tigte. Das bedeutet,<br>dass Sie zu einer Version geupdated haben, die selbst geupdated werden muss.<br>Um diesen Fehler zu beheben, m\u00FCssen Sie das Verzechnis gehen, das die Sicherungskopie Ihres GGCs enh\u00E4lt<br>(wie in der Anleitung beschrieben), dieses ausf\u00FChren und eine Sicherung erstellen<br>(falls Sie das nicht schon gemacht haben). Danach m\u00FCssen Sie das init_db Skript ausf\u00FChren,<br>das die neue Version der Datenbank erstellen wird. Starten Sie GGC und stellen Sie die Datenbank<br>anhand der vorher erstellten Sicherungskopie wieder her.<br>Ihre Applikation sollte jetzt wieder alle Daten enthalten.<br>
-DB_VERSION_HIGHER=Die gegenw\u00E4rtige Version ist gr\u00F6\u00DFer als die ben\u00F6tigte. Dies kann zwei Gr\u00FCnde haben:<br><br>1. Es gabe ein Problem bei der Installation oder beim Update (Dateien fehlten oder das Update wurde unterbrochen).<br>Nach einem Teil-Update wurde die Datenbank geupdated. War dies der Fall, muss das Update wiederholt<br>(ALLE Dateien neu kopiert/installiert) und GGC erneut ausgef\u00FChrt werden.<br><br>2. Ein Downgrade wurde versucht. Dies wird nicht unterst\u00FCzt. Wollen Sie eine \u00E4ltere Version benutzen,<br>m\u00FCssen Sie eine komplette Sicherungskopie erstellen, die Anwendung in ein anderes Verzeichnis installieren und<br>die Daten wiederherstellen. Dieses Problem kann auch durch das Einspielen eines Updates behoben werden.<br>
-
-#
-# Error Dialog [1]
-#
-ERROR_DIALOG=Fehlerdialog
-DETAILS=Details
-ERROR_SOLUTION=L\u00F6sung
-EXCEPTION_LOG=Exception (Stacktrace)
-SEND_TO_SERVER=An den Server senden
-SENDING_TO_SERVER=Sende an den Server...
-SEND_TO_SERVER_TEXT=<html>Diese Funktionalität wurde noch nicht implementiert.<br>Später können Sie uns hiermit Fehlerberichte senden und<br>Lösungsvorschläge erhalten (falls welche existieren).<br></html>
-NO_SOLUTION_AVAILABLE=<html>Keine Lösung verfügbar.</html>
-
-#
-# Plug-In [1]
-#
-DEVICE_METER=Meter
-DEVICE_PUMP=Pumpe
-DEVICE_CGMS=CGMS
-PLUGIN_NOT_INSTALLED=Plugin nicht installiert.
-PLUGIN_NA=Plugin nicht verf\u00FCgbar.
-PLUGIN_NO_FUNCTIONALITY=Diese Funktionalit\u00E4t wird nicht unterst\u00FCtzt.
-DEVICES_USED=Verwendete Ger\u00E4te (eing...
[truncated message content] |
|
From: <and...@us...> - 2016-12-25 16:11:38
|
Revision: 1425
http://sourceforge.net/p/ggc/code/1425
Author: andyrozman
Date: 2016-12-25 16:11:36 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Plugins
- moved all files from old project
Modified Paths:
--------------
trunk/ggc-plugins/ggc-plugins-base/build/build.xml
trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/comm/cfg/SerialSettings.java
trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/device/PlugInBaseException.java
Added Paths:
-----------
trunk/ggc-plugins/ggc-plugins-base/.settings/
trunk/ggc-plugins/ggc-plugins-base/build/
trunk/ggc-plugins/ggc-plugins-base/docs/
trunk/ggc-plugins/ggc-plugins-base/pom.xml
trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/
trunk/ggc-plugins/ggc-plugins-base/src/main/resources/GGCPlugin_de.properties
trunk/ggc-plugins/ggc-plugins-base/src/main/resources/GGCPlugin_en.properties
trunk/ggc-plugins/ggc-plugins-base/src/main/resources/GGCPlugin_fr.properties
trunk/ggc-plugins/ggc-plugins-base/src/main/resources/GGCPlugin_si.properties
trunk/ggc-plugins/ggc-plugins-base/src/main/resources/icons/
Removed Paths:
-------------
trunk/ggc-plugin_base/.settings/
trunk/ggc-plugin_base/build/
trunk/ggc-plugin_base/docs/
trunk/ggc-plugin_base/pom.xml
trunk/ggc-plugin_base/src/GGCPlugin_de.properties
trunk/ggc-plugin_base/src/GGCPlugin_en.properties
trunk/ggc-plugin_base/src/GGCPlugin_fr.properties
trunk/ggc-plugin_base/src/GGCPlugin_si.properties
trunk/ggc-plugin_base/src/ggc/
trunk/ggc-plugin_base/src/icons/
Deleted: trunk/ggc-plugin_base/pom.xml
===================================================================
--- trunk/ggc-plugin_base/pom.xml 2016-12-25 16:06:50 UTC (rev 1424)
+++ trunk/ggc-plugin_base/pom.xml 2016-12-25 16:11:36 UTC (rev 1425)
@@ -1,107 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
- </parent>
-
- <name>GGC Plugin Base Project</name>
-
- <artifactId>ggc-plugin-base</artifactId>
- <version>${ggc-plugin-base.version}</version>
-
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-core</artifactId>
- </dependency>
-
- <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId>
- </dependency> -->
-
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.ibm.old.comapi</groupId>
- <artifactId>ibm-compapi</artifactId>
- </dependency>
-
- <!--
- <dependency>
- <groupId>com.neuronrobotics</groupId>
- <artifactId>nrjavaserial</artifactId>
- </dependency>
--->
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.neuronrobotics</groupId>
- <artifactId>nrjavaserial-j15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-j15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hid4java</groupId>
- <artifactId>hid4java-j15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.scream3r</groupId>
- <artifactId>jssc</artifactId>
- </dependency>
-
- </dependencies>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
-
-</project>
Deleted: trunk/ggc-plugin_base/src/GGCPlugin_de.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2016-12-25 16:06:50 UTC (rev 1424)
+++ trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2016-12-25 16:11:36 UTC (rev 1425)
@@ -1,404 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 0.6.1 ###
-# ### Last change: 20.09.2014 13:39:15 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 245
-# Not translated: 235 (96 %)
-# Need to be checked: 1 (0 %)
-#
-# Translated: 9 (4 %)
-#
-#
-#
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# General [1]
-#
-
-# buttons and general stuff
-CANCEL=Abbrechen
-OK=OK
-HELP=Hilfe
-CLOSE=Schlie\u00DFen
-APPLY=Anwenden
-LOG__=log:
-SELECT=Select
-ERROR=Error
-ADD=Add
-EDIT=Edit
-DELETE=Delete
-NEXT=Next
-YES=Yes
-NO=No
-WARNING=Warning
-UNIT_MMOLL=mmol/L
-UNIT_MGDL=mg/dL
-FALSE=False
-TRUE=True
-DATE=Date
-TIME=Time
-GRAPH=Graph
-SELECT_ITEM_FIRST=Please select item first.
-ARE_YOU_SURE_DELETE=Are you sure you want to delete this item/entry?
-QUESTION=Question
-INFORMATION=Information
-INVALID_DATA=Invalid data
-VERSION=Version
-
-# weeks days and months
-SU=Su
-MO=Mo
-TU=Tu
-WE=We
-TH=Th
-FR=Fr
-SA=Sa
-DAY=Tag
-
-SUNDAY=Sontag
-MONDAY=Montag
-TUESDAY=Dienstag
-WEDNESDAY=Mittwoch
-THURSDAY=Donnerstag
-FRIDAY=Freitag
-SATURDAY=Samstag
-JANUARY=January
-FEBRUARY=February
-MARCH=March
-APRIL=April
-MAY=May
-JUNE=June
-JULY=July
-AUGUST=August
-SEPTEMBER=September
-OCTOBER=October
-NOVEMBER=November
-DECEMBER=December
-
-#
-# Configuration [1]
-#
-MY__=My
-DEVICE_COMPANY=Company
-DEVICE_DEVICE=Ger\u00E4t
-NO_COMPANY_SELECTED=No company selected.
-NO_DEVICE_SELECTED=No device selected.
-TIMEZONE_CONFIGURATION=TimeZone Configuration
-SELECT_ITEM_OR_CANCEL=Select one of items or use Cancel option.
-SELECT_MASS_STORAGE_DRIVE=Select Mass Storage Drive
-SELECT_SERIAL_PORT=Select Serial Port
-SERIAL_PORT=Serial Port
-MASS_STORAGE_DRIVE=Mass Storage Drive
-NEW__=New
-NOT_SET=Not Set !
-TIMEZONE_PREFERENCES=TimeZone Preferences
-SELECT_TIMEZONE_LIST=Select correct timezone
-NEED_DAYLIGHTSAVING_FIX=Do we need daylight savings fix?
-WINTERTIME_FIX=Winter Time Fix
-SUMMERTIME_FIX=Summer Time Fix
-DEVICE_CONNECTION=Device connection
-CUSTOM_NAME=Custom name
-COMMUNICATION_SETTINGS=Communication Settings
-CONFIG_ERROR_NO_DEVICE_OR_PARAMETERS=<html>Configuration Error:<br>You either didn't select device, or you didn't correctly<br>enter all required parameters.<br></html>
-DEVICE_VERSION=Device version
-
-#
-# Ports [1]
-#
-COMMUNICATION_PORT=Communication Port
-
-#
-# Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-CONFIGURED_DEVICE=Configured Device
-INSTRUCTIONS=Instructions for Download
-MY_DEVICE_NAME=My name
-DEVICE_ICON=%s picture
-DEVICE_NAME_=Device name
-CONNECTION_TYPE=Connection
-CONNECTION_PARAMETER=C. Parameter
-STATUS=Status
-DAYLIGHTSAVINGS_FIX=Time (DS) fix
-DS_NO=No
-DS_FIX_SHORT=Yes (W.=%s / S.=%s)
-DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s
-DEVICE_DOESNT_SUPPORT_DS_FIX=Not supported by device !
-DEVICE_DOESNT_SUPPORT_DS_FIX_2=Device doesn't support Daylight savings fix
-INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your device entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html>
-START_DOWNLOAD=Start Download >>>
-WAIT_UNTIL_DEVICE_PREINIT=Please wait until device is pre-inited!
-
-# status
-ERROR_IN_CONFIG=Error in config
-READY=Ready
-
-# Download support
-DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html>
-DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
-DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support import of data through files.<br></html>
-DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support download of configuration.<br></html>
-INTERNAL_CONFIGURATION_ERROR=<html>There seems to be internal problem<br>in configuration of application.<br></html>
-
-#
-# File Selector [1]
-#
-IMPORT_FILE_SELECTOR=Import File Selector
-IMPORT_FILE_SELECTOR_DESC=<html><body>Please select import file of selected type. </body></html>
-SELECT_FILE=Select file:
-BROWSE=Browse
-MULTIPLE_IMPORT_SELECTOR=Multiple Import Selector
-MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>This device has several possible import types. Please select correct import type, for import type you have available. </body></html>
-
-#
-# Transfer display [1]
-#
-ERROR_CONTACTING_DEVICE=We had problem contacting device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-BREAK_COMMUNICATION=Break Communication
-EXPORT_DATA=Export Data
-DATA=Data
-LOG=Log
-DEVICE_INFO=%s Info
-ACTION=Action
-READING_OLD_DATA=Reading old data (from Db)
-STATUS_NONE=Unknown Status
-STATUS_READY=Ready
-STATUS_DOWNLOADING=Downloading
-STATUS_STOPPED_DEVICE=Download stopped (by device)
-STATUS_STOPPED_USER=Download stopped by user
-STATUS_DOWNLOAD_FINISHED=Download finished
-STATUS_READER_ERROR=Internal %s (or port) error
-UNKNOWN=Unknown
-NEW=New
-CHANGED=Changed
-OLD=Old
-LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log is currently not available.
-READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s]
-SW_VERSION=SW Version
-HW_VERSION=HW Version
-SELECT_ALL=Select All
-DESELECT_ALL=Deselect All
-FILTER=Filter
-FILTER_ALL=All
-FILTER_NEW=New
-FILTER_CHANGED=Changed
-FILTER_EXISTING=Old
-FILTER_UNKNOWN=Unknown
-FILTER_NEW_CHANGED=New + Changed
-FILTER_ALL_BUT_EXISTING=All except old
-
-#
-# Export [1]
-#
-EXPORT_OUTPUT=Output for export
-EXPORT_DEVICE_DATA=Export %s Data
-GGC_APPLICATION=GGC Application
-EXPORT_PROGRESS=Progress of export
-START=Start
-EXPORT_STATUS_READY=Ready
-EXPORT_STATUS_EXPORTING=Exporting
-EXPORT_STATUS_FINISHED=Finished
-
-#
-# List [1]
-#
-LEGEND_DESC=<html><b>Legend:</b><br><font color="green">Green</font> = All known devices supported<br><font color="#33FFFF">Cyan</font> = Testing<br><font color="#660066">Magenta</font> = some devices implemented<br><font color="blue">Blue</font> = work in progress<br><font color="#FFCC33">Orange</font> = Planned<br><font color="red">Red</font> = Not Planned</html>
-
-#
-# About [1]
-#
-SYSTEM_PROPERTIES=System Properties
-ABOUT=About
-PROPERTY=Property
-VALUE=Value
-LICENCE=Licence
-CREDITS=Credits
-LIBRARIES=Libraries
-GGC_DEVELOPMENT_TEAM=GGC Development Team
-SEE_CREDITS=(See Credits)
-DEVELOPERS_DESC=Developers & features they implemented
-HELPERS_DESC=People that helped (testing, lending or donating hardware,...)
-FEATURES=Features
-IMPLEMENTED_FEATURES=Implemented Features
-SUPPORTED_DEVICES=Supported Devices
-NOT_IMPLEMENTED_FEATURES=Not Implemented Features
-PLANNED_DEVICES=Planned Devices
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-#
-# Printing - Base [2]
-#
-PRINTING=Printing
-TYPE_OF_REPORT=Type Of Report
-SELECT_YEAR_AND_MONTH=Select Year And Month
-REPORT_FOOTER=Dieser Bericht wurde von "GGC - GNU Gluco Control" erstellt, frei verf\u00FCgbar unter http://ggc.sourceforge.net
-FOR=f\u00FCr
-PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html>
-PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html>
-PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html>
-SELECT_STARTING_RANGE=Select starting range
-SELECT_ENDING_RANGE=Select ending range
-PAGE=Seite
-
-#
-# Device Interfaces [1]
-#
-SERIAL_PORTS=Serielle Schnittstellen: COM2,...
-MASS_STORAGE=Mass Storage: G:,...
-
-#
-# Used protocols [1]
-#
-DEVICE_PROTOCOL=Protocol
-PROT_NONE=None (dummy or N/A)
-PROT_SERIAL_BRIDGE=Serial (or USB bridge)
-PROT_MASS_STORAGE_XML=Mass Storage (Xml)
-PROT_BLUE_TOOTH=BlueTooth
-PROT_BLUETOOTH_SERIAL=Bluetooth (Serial)
-PROT_SERIAL_USB=Serial (USB)
-PROT_FILE_IMPORT=File import
-PROT_DATABASE=Database
-
-#
-# Libraries [1]
-#
-NO_BINARY_PART_FOUND=Device uses special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n<GGC_Install>\lib\native\%s\nand look for file: '%s'.\nIf it's not there you must obtain it,\nif it is there, then there is something\nwrong with it (re-obtain it).\n
-
-#
-# Special Comments [1]
-#
-DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated.
-DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device.
-
-#
-# Error Dialog [1]
-#
-ERROR_DIALOG=Error Dialog
-DETAILS=Details
-ERROR_SOLUTION=Solution
-EXCEPTION_LOG=Exception (Stack) Trace
-SEND_TO_SERVER=Send to Server
-SENDING_TO_SERVER=Sending to Server
-SEND_TO_SERVER_TEXT=<html>This part is not implemented yet. But at later time when<br>this works, you will able to send us report of error<br>and receive solution (if it exists).<br></html>
-NO_SOLUTION_AVAILABLE=No solution available.
-ERROR_COUNT=Errors (%s)
-
-#
-# Download Device [2]
-#
-DOWNLOAD_DEVICE=Data from device
-DOWNLOAD_FILE=Import from file
-DOWNLOAD_CONFIG=Config from device
-DOWNLOAD_NOT_SUPPORTED_GGC=Not supported by GGC
-DOWNLOAD_NOT_SUPPORTED_BY_DEVICE=Not supported by device
-
-#
-# File Import [2]
-#
-IMPORT_FILE=Import file
-
-#
-# Devices [1]
-#
-
-# Smart pix
-PIX_ABORT_AUTOSCAN=Autoscan aborted
-PIX_DETECT_DEVICES=Detecting devices
-PIX_UNRECOVERABLE_ERROR=Unrecoverable error
-PIX_READING_ELEMENT=Reading elements from device
-PIX_FINISHED_REPORT_READY=Finished reading. Report ready.
-PIX_FINISHED_READING=Finished reading. Report ready.
-PIX_READING=Reading data
-PIX_SCANNING=Scanning for device
-PIX_CREATING_REPORT=Creating report
-PIX_DEVICE_NOT_FOUND=Device not found
-PIX_ERROR_INIT_DEVICE=Error on init/read device
-SMARTPIX_VERSION_2=SmartPix v2.x
-SMARTPIX_VERSION_3=SmartPix v3.x or higher
-SMARTPIX_VERSION_INFO=<html><b>Smart Pix Version Info<br><br></b><b><i>SmartPix v1.x</i></b> - Devices with this firmware are not supported, because<br> they had too many bugs (for external use). If your device still has v1<br>firmware you can update it for free (see Roche site).<br><b><i>SmartPix v2.x</i></b> - Version 2 works ok on Windows, but there is problem<br>on other OSes (we tested on linux and Mac and it didn't work on any<br>of them)<br><b><i>SmartPix v3.x</i></b> - This version uses different type of commands for<br>controling devices, which works great on all OSes, so this is preffered<br>version to use.<br></html>
-
-# Minimed Pump/CGMS
-MM_DEVICE_INIT_PROBLEM=%s problem on initialization with %s:\n%s\n
-MM_INVALID_RETURN_VALUE=Invalid return value (%s), return value should be between %s and %s.
-MM_WRONG_STATE=Device is in wrong state for successful reading (current state=%s, required state=%s).
-MM_DEVICE_PUMP=Pump
-MM_DEVICE_CGMS=CGMS
-MM_PUMP_ERROR_REPLY=Error Reply
-MM_PUMP_STATE_REPLY=State Reply
-MM_ERROR_READING_DEVICE=Error on reading device.
-MM_SET_RF_POWER_ON=Set RF Power On
-MM_READ_PUMP_ERROR_STATUS=Read Pump Error Status (current alarm code)
-MM_READ_PUMP_STATE=Read Pump State
-MM_READ_TEMPORARY_BASAL=Read Temporary Basal
-MM_DETECT_BOLUS=Detect bolus (set temp basal rate)
-MM_ACKNOWLEDGE=Acknowledge
-MM_CANCEL_SUSPEND=Cancel Suspend
-MM_KEYPAD_PUSH_ACK=Keypad Push (ACK)
-MM_KEYPAD_PUSH_ESC=Keypad Push (ESC)
-MM_READ_FIRMWARE_VERSION=Read Firmware Version
-MM_PUMP_DELIVERY_TBR=Check TBR delivery
-MM_PUMP_DELIVERING_TBR=Pump is currently delivering TBR and cannot communicate with computer.
-
-#
-# Graphs [1]
-#
-
-# Date/range selector
-DATE_RANGE_SELECTOR=Range Selector
-ONE_WEEK=1 Week
-TWO_WEEKS=2 Weeks
-1_MONTH=1 Month
-3_MONTHS=3 Months
-CUSTOM=Custom
-RANGE=Range
-
-
-#
-# Device Events (2)
-#
-EVENT_TYPE=Event Type
-EVENT_POWER_DOWN=Power Down
-EVENT_POWER_UP=Power Up
-EVENT_DATETIME_SET=Datum/Zeit gestellt
-EVENT_DATETIME_CORRECT=Datum/Zeit korrigiert
-EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back
-EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward
-EVENT_DATETIME_CHANGED=Date/Time Changed
-EVENT_BATTERY_REMOVED=Batterie entfernt
-EVENT_BATTERY_REPLACED=Batterie gewechselt
-EVENT_BATTERY_LOW=Batterie fast leer
-EVENT_BATTERY_LOW_DESC=Batterie fast leer (%s)
-
-
-#
-# Device Errors [2]
-#
-ERROR_TYPE=Fehlertyp
-ERROR_UNKNOWN_ERROR=Unbekannter Fehler
-ERROR_BATTERY_DEPLETED=Batterie leer
-ERROR_AUTOMATIC_OFF=Automatic Off
-ERROR_END_OF_OPERATION=End Of Operation
-ERROR_MECHANICAL_ERROR=Mechanischer Fehler
-ERROR_ELECTRONIC_ERROR=Elektronischer Fehler
-ERROR_POWER_INTERRUPT=Stromzufuhr unterbrochen
-ERROR_DATA_INTERRUPTED=Data Interrupted
-ERROR_LANGUAGE_ERROR=Sprachfehler
Deleted: trunk/ggc-plugin_base/src/GGCPlugin_en.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_en.properties 2016-12-25 16:06:50 UTC (rev 1424)
+++ trunk/ggc-plugin_base/src/GGCPlugin_en.properties 2016-12-25 16:11:36 UTC (rev 1425)
@@ -1,584 +0,0 @@
-#
-# !MASTER_FILE!
-# !S! MODULE=GGC Plugin Base
-# !S! MODULE_VERSION=0.6.1
-#
-# ######################################################################
-# ### GGC PlugIn Base ###
-# ######################################################################
-# ### Language: English ###
-# ### Created by: Andy Rozman (an...@at...) ###
-# ### Last change: 13th October 2015 ###
-# ### Library Version: 1.0.2 ###
-# ### Application Version: 0.6.2 ###
-# ######################################################################
-#
-# Please use this file as default language file. Do not try to translate
-# from any other files, since this is the Master language file. Create the
-# same header and specify application version number for easier changes at
-# later time.
-# Translations should be grouped by groups as specified here.
-# Older groups are done by packages, newer by logical name.
-
-#
-# In brackets there are now tags which define urgency of some text beeing translated
-# !S! GROUP_PRIORITY_1=Needed, urgent (Base functionality, options which will be used by user mostly)
-# !S! GROUP_PRIORITY_2=Needed
-# !S! GROUP_PRIORITY_3=Not used yet (in public releases)
-# !S! GROUP_PRIORITY_4=In implementation
-#
-# * - If tags also has *, then it means that this string can change regulary, last update is in []
-#
-
-
-
-#
-# !G! General [1]
-#
-
-# !SG! buttons and general stuff
-CANCEL=Cancel
-OK=OK
-HELP=Help
-CLOSE=Close
-APPLY=Apply
-LOG__=log:
-SELECT=Select
-ERROR=Error
-ADD=Add
-EDIT=Edit
-DELETE=Delete
-NEXT=Next
-YES=Yes
-NO=No
-WARNING=Warning
-UNIT_MMOLL=mmol/L
-UNIT_MGDL=mg/dL
-FALSE=False
-TRUE=True
-DATE=Date
-TIME=Time
-GRAPH=Graph
-SELECT_ITEM_FIRST=Please select item first.
-ARE_YOU_SURE_DELETE=Are you sure you want to delete this item/entry?
-QUESTION=Question
-INFORMATION=Information
-INVALID_DATA=Invalid data
-VERSION=Version
-
-# !SG! weeks days and months
-DAY=Day
-SU=Su
-MO=Mo
-TU=Tu
-WE=We
-TH=Th
-FR=Fr
-SA=Sa
-
-SUNDAY=Sunday
-MONDAY=Monday
-TUESDAY=Tuesday
-WEDNESDAY=Wednesday
-THURSDAY=Thursday
-FRIDAY=Friday
-SATURDAY=Saturday
-
-JANUARY=January
-FEBRUARY=February
-MARCH=March
-APRIL=April
-MAY=May
-JUNE=June
-JULY=July
-AUGUST=August
-SEPTEMBER=September
-OCTOBER=October
-NOVEMBER=November
-DECEMBER=December
-
-
-#
-# !G! Configuration [1]
-#
-MY__=My
-DEVICE_COMPANY=Company
-DEVICE_DEVICE=Device
-NO_COMPANY_SELECTED=No company selected.
-NO_DEVICE_SELECTED=No device selected.
-TIMEZONE_CONFIGURATION=TimeZone Configuration
-SELECT_ITEM_OR_CANCEL=Select one of items or use Cancel option.
-SELECT_MASS_STORAGE_DRIVE=Select Mass Storage Drive
-SELECT_SERIAL_PORT=Select Serial Port
-SELECT_USB_DEVICE=Select USB Device
-SERIAL_PORT=Serial Port
-USB_DEVICE=USB Device
-MASS_STORAGE_DRIVE=Mass Storage Drive
-NEW__=New
-NOT_SET=Not Set !
-TIMEZONE_PREFERENCES=TimeZone Preferences
-SELECT_TIMEZONE_LIST=Select correct timezone
-NEED_DAYLIGHTSAVING_FIX=Do we need daylight savings fix?
-WINTERTIME_FIX=Winter Time Fix
-SUMMERTIME_FIX=Summer Time Fix
-DEVICE_CONNECTION=Device connection
-CUSTOM_NAME=Custom name
-COMMUNICATION_SETTINGS=Communication Settings
-CONFIG_ERROR_NO_DEVICE_OR_PARAMETERS=<html>Configuration Error:<br>You either didn't select device, or you didn't correctly<br>enter all required parameters.<br></html>
-DEVICE_VERSION=Device version
-
-#
-# !G! Ports [1]
-#
-COMMUNICATION_PORT=Communication Port
-
-
-#
-# !G! Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-CONFIGURED_DEVICE=Configured Device
-INSTRUCTIONS=Instructions for Download
-MY_DEVICE_NAME=My name
-DEVICE_ICON=%s picture
-DEVICE_NAME_=Device name
-CONNECTION_TYPE=Connection
-CONNECTION_PARAMETER=C. Parameter
-STATUS=Status
-DAYLIGHTSAVINGS_FIX=Time (DS) fix
-DS_NO=No
-DS_FIX_SHORT=Yes (W.=%s / S.=%s)
-DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s
-DEVICE_DOESNT_SUPPORT_DS_FIX=Not supported by device !
-DEVICE_DOESNT_SUPPORT_DS_FIX_2=Device doesn't support Daylight savings fix
-INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your device entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html>
-START_DOWNLOAD=Start Download >>>
-WAIT_UNTIL_DEVICE_PREINIT=Please wait until device is pre-inited!
-
-# !SG! status
-ERROR_IN_CONFIG=Error in config
-READY=Ready
-
-# !SG! Download support
-DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html>
-DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
-DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support import of data through files.<br></html>
-DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support download of configuration.<br></html>
-INTERNAL_CONFIGURATION_ERROR=<html>There seems to be internal problem<br>in configuration of application.<br></html>
-
-
-#
-# !G! File Selector [1]
-#
-IMPORT_FILE_SELECTOR=Import File Selector
-IMPORT_FILE_SELECTOR_DESC=<html><body>Please select import file of selected type. </body></html>
-SELECT_FILE=Select file:
-BROWSE=Browse
-MULTIPLE_IMPORT_SELECTOR=Multiple Import Selector
-MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>This device has several possible import types. Please select correct import type, for import type you have available. </body></html>
-
-#
-# !G! Transfer display [1]
-#
-ERROR_CONTACTING_DEVICE=We had problem contacting device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-BREAK_COMMUNICATION=Break Communication
-EXPORT_DATA=Export Data
-DATA=Data
-LOG=Log
-DEVICE_INFO=%s Info
-ACTION=Action
-READING_OLD_DATA=Reading old data (from Db)
-STATUS_NONE=Unknown Status
-STATUS_READY=Ready
-STATUS_DOWNLOADING=Downloading
-STATUS_STOPPED_DEVICE=Download stopped (by device)
-STATUS_STOPPED_USER=Download stopped by user
-STATUS_DOWNLOAD_FINISHED=Download finished
-STATUS_READER_ERROR=Internal %s (or port) error
-
-UNKNOWN=Unknown
-NEW=New
-CHANGED=Changed
-OLD=Old
-
-LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log is currently not available.
-READ_DEVICE_DATA_TITLE=Read %s Data [%s on %s]
-SW_VERSION=SW Version
-HW_VERSION=HW Version
-SELECT_ALL=Select All
-DESELECT_ALL=Deselect All
-FILTER=Filter
-FILTER_ALL=All
-FILTER_NEW=New
-FILTER_CHANGED=Changed
-FILTER_EXISTING=Old
-FILTER_UNKNOWN=Unknown
-FILTER_NEW_CHANGED=New + Changed
-FILTER_ALL_BUT_EXISTING=All except old
-
-
-#
-# !G! Export [1]
-#
-EXPORT_OUTPUT=Output for export
-EXPORT_DEVICE_DATA=Export %s Data
-GGC_APPLICATION=GGC Application
-EXPORT_PROGRESS=Progress of export
-START=Start
-EXPORT_STATUS_READY=Ready
-EXPORT_STATUS_EXPORTING=Exporting
-EXPORT_STATUS_FINISHED=Finished
-
-
-
-#
-# !G! List [1]
-#
-LEGEND_DESC=<html><b>Legend:</b><br><font color="green">Green</font> = All known devices supported<br><font color="#33FFFF">Cyan</font> = Testing<br><font color="#660066">Magenta</font> = some devices implemented<br><font color="blue">Blue</font> = work in progress<br><font color="#FFCC33">Orange</font> = Planned<br><font color="red">Red</font> = Not Planned</html>
-
-
-#
-# !G! About [1]
-#
-SYSTEM_PROPERTIES=System Properties
-ABOUT=About
-PROPERTY=Property
-VALUE=Value
-LICENCE=Licence
-CREDITS=Credits
-LIBRARIES=Libraries
-GGC_DEVELOPMENT_TEAM=GGC Development Team
-SEE_CREDITS=(See Credits)
-DEVELOPERS_DESC=Developers & features they implemented
-HELPERS_DESC=People that helped (testing, lending or donating hardware,...)
-FEATURES=Features
-IMPLEMENTED_FEATURES=Implemented Features
-SUPPORTED_DEVICES=Supported Devices
-NOT_IMPLEMENTED_FEATURES=Not Implemented Features
-PLANNED_DEVICES=Planned Devices
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-
-#
-# !G! Printing - Base [2]
-#
-PRINTING=Printing
-TYPE_OF_REPORT=Type Of Report
-SELECT_YEAR_AND_MONTH=Select Year And Month
-REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
-FOR=For
-PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html>
-PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html>
-PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html>
-SELECT_STARTING_RANGE=Select starting range
-SELECT_ENDING_RANGE=Select ending range
-PAGE=Page
-
-#
-# !G! Device Interfaces [1]
-#
-SERIAL_PORTS=Serial Ports: COM2,...
-MASS_STORAGE=Mass Storage: G:,...
-CGMS_DEVICE_SHORT=CGMS
-
-
-#
-# !G! Used protocols [1]
-#
-DEVICE_PROTOCOL=Protocol
-PROT_NONE=None (dummy or N/A)
-PROT_SERIAL_BRIDGE=Serial (or USB bridge)
-PROT_MASS_STORAGE_XML=Mass Storage (Xml)
-PROT_BLUE_TOOTH=BlueTooth
-PROT_BLUETOOTH_SERIAL=Bluetooth (Serial)
-PROT_SERIAL_USB=Serial (USB)
-PROT_USB_HID=USB (Hid)
-PROT_FILE_IMPORT=File import
-PROT_DATABASE=Database
-PROT_MULTIPLE=Multiple
-
-
-#
-# !G! Libraries [1]
-#
-NO_BINARY_PART_FOUND=Device uses special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n<GGC_Install>\\lib\\native\\%s\nand look for file: '%s'.\nIf it's not there you must obtain it,\nif it is there, then there is something\nwrong with it (re-obtain it).\n
-
-
-#
-# !G! Special Comments [1]
-#
-DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated.
-DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device.
-
-
-#
-# !G! Error Dialog [1]
-#
-ERROR_DIALOG=Error Dialog
-DETAILS=Details
-ERROR_SOLUTION=Solution
-EXCEPTION_LOG=Exception (Stack) Trace
-SEND_TO_SERVER=Send to Server
-SENDING_TO_SERVER=Sending to Server
-SEND_TO_SERVER_TEXT=<html>This part is not implemented yet. But at later time when<br>this works, you will able to send us report of error<br>and receive solution (if it exists).<br></html>
-NO_SOLUTION_AVAILABLE=No solution available.
-ERROR_COUNT=Errors (%s)
-
-
-#
-# !G! Download Device [2]
-#
-DOWNLOAD_DATA=Data from device
-DOWNLOAD_DATA_FILE=Data from file
-DOWNLOAD_CONFIG=Config from device
-DOWNLOAD_CONFIG_FILE=Config from file
-DOWNLOAD_DATA_SHORT=Data
-DOWNLOAD_DATA_FILE_SHORT=Data (file)
-DOWNLOAD_CONFIG_SHORT=Config
-DOWNLOAD_CONFIG_FILE_SHORT=Config (file)
-DOWNLOAD_NOT_SUPPORTED_GGC=Not supported by GGC
-DOWNLOAD_NOT_SUPPORTED_GGC_SHORT=No GGC support
-DOWNLOAD_NOT_SUPPORTED_GGC_YET=Not supported by GGC yet
-DOWNLOAD_NOT_SUPPORTED_GGC_YET_SHORT=No GGC support yet
-DOWNLOAD_NOT_SUPPORTED_BY_DEVICE=Not supported by device
-DOWNLOAD_NOT_SUPPORTED_BY_DEVICE_SHORT= -
-
-
-
-
-#
-# !G! File Import [2]
-#
-IMPORT_FILE=Import file
-
-
-#
-# !G! Devices [1]
-#
-
-# !SG! Smart pix
-PIX_ABORT_AUTOSCAN=Autoscan aborted
-PIX_DETECT_DEVICES=Detecting devices
-PIX_UNRECOVERABLE_ERROR=Unrecoverable error
-PIX_READING_ELEMENT=Reading elements from device
-PIX_FINISHED_REPORT_READY=Finished reading. Report ready.
-PIX_FINISHED_READING=Finished reading. Report ready.
-PIX_READING=Reading data
-PIX_SCANNING=Scanning for device
-PIX_CREATING_REPORT=Creating report
-PIX_DEVICE_NOT_FOUND=Device not found
-PIX_ERROR_INIT_DEVICE=Error on init/read device
-SMARTPIX_VERSION_2=SmartPix v2.x
-SMARTPIX_VERSION_3=SmartPix v3.x or higher
-SMARTPIX_VERSION_INFO=<html><b>Smart Pix Version Info<br><br></b><b><i>SmartPix v1.x</i></b> - Devices with this firmware are not supported, because<br> they had too many bugs (for external use). If your device still has v1<br>firmware you can update it for free (see Roche site).<br><b><i>SmartPix v2.x</i></b> - Version 2 works ok on Windows, but there is problem<br>on other OSes (we tested on linux and Mac and it didn't work on any<br>of them)<br><b><i>SmartPix v3.x</i></b> - This version uses different type of commands for<br>controling devices, which works great on all OSes, so this is preffered<br>version to use.<br></html>
-
-
-# !SG! Ascensia
-PRODUCT_CODE=Product Code
-SOFTWARE_VERSION=Software Version
-EEPROM_VERSION=EEprom Version
-SERIAL_NUMBER=Serial Number
-USER_MARKS=User Marks
-MARKERS=Markers
-MARKER_HI=High BG
-
-
-# !SG! Minimed
-MM_CONN_INTERFACE=Conn. interface
-MM_SERIAL_NR=Serial #
-
-
-
-#
-# !G! Graphs [1]
-#
-
-# !SG! Date/range selector
-DATE_RANGE_SELECTOR=Range Selector
-ONE_WEEK=1 Week
-TWO_WEEKS=2 Weeks
-1_MONTH=1 Month
-3_MONTHS=3 Months
-CUSTOM=Custom
-RANGE=Range
-
-
-#
-# !G! Device Events [2]
-#
-EVENT_TYPE=Event Type
-EVENT_POWER_DOWN=Power Down
-EVENT_UNKNOWN=Event Unknown
-EVENT_POWER_UP=Power Up
-EVENT_DATETIME_SET=Date/Time Set
-EVENT_DATE_SET=Date Set
-EVENT_TIME_SET=Time Set
-EVENT_DATETIME_CORRECT=Date/Time Corrected
-EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back
-EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward
-EVENT_DATETIME_CHANGED=Date/Time Changed
-EVENT_SELF_TEST=Device Self-test
-EVENT_DOWNLOAD=Device Data Download
-EVENT_BATTERY_REMOVED=Battery removed
-EVENT_BATTERY_REPLACED=Battery replaced
-EVENT_BATTERY_LOW=Battery low
-EVENT_BATTERY_LOW_DESC=Battery low (%s)
-
-
-#
-# !G! Device Errors [2]
-#
-ERROR_TYPE=Error Type
-ERROR_UNKNOWN_ERROR=Unknown Error
-ERROR_BATTERY_DEPLETED=Battery Depleted
-ERROR_AUTOMATIC_OFF=Automatic Off
-ERROR_END_OF_OPERATION=End Of Operation
-ERROR_MECHANICAL_ERROR=Mechanical Error
-ERROR_ELECTRONIC_ERROR=Electronic Error
-ERROR_POWER_INTERRUPT=Power Interrupt
-ERROR_DATA_INTERRUPTED=Data Interrupted
-ERROR_LANGUAGE_ERROR=Language Error
-
-
-#
-# !G! Device Alarms [2]
-#
-ALARM_UNKNOWN=Unknown Alarm
-ALARM_TYPE=Alarm Type
-ALARM_BATTERY_LOW=Battery Low
-ALARM_REVIEW_DATETIME=Review Date/Time
-ALARM_ALARM_CLOCK=Alarm Clock
-ALARM_REPLACE_BATTERY=Replace Battery
-ALARM_EMPTY_CARTRIDGE=Empty Cartridge
-ALARM_AUTO_OFF=Auto Off
-ALARM_CALL_SERVICE=Call Service
-ALARM_AUTO_OFF_SOON=Auto Off in %s
-ALARM_CLOCK_RESET=Clock reset
-
-
-#
-# !G! Instructions [1]
-#
-INSTRUCTIONS_ANIMAS_V2=<html><li>Attach Animas USB interface</li><li>Click on "Start Download"</li><li>Put Pump in Suspend state</li><li>Last side of Pump needs to face USB interface</li><li>Pump Screen needs to be active. If Screen<br>goes dark, communication will not start, so if<br> it is dark, press any button so that screen<br>is active.</li></html>
-
-INSTRUCTIONS_MINIMED=<html><li>Attach Carelink USB device (or Contour Next Link).<br>Be careful you might have problems on some<br>systems with CareLink USB (you might need to<br>attach/detach it several times)</li><li>Place your pump in front of device (transmiter<br>is on same side as cannula)</li><li>Click on "Start Download"</li><br><br><b><i>Contour Next Link is not yet supported.</i></b></html>
-
-#
-# !G! Device Configuration (only base, other is Device Specific) [2]
-#
-
-# !SG! Configuration Group
-GROUP_GENERAL=General Settings
-GROUP_DEVICE=Device Settings
-GROUP_SOUND=Sound Settings
-GROUP_OTHER=Other Settings
-
-#
-# !SG! Base Stuff
-#
-CFG_BASE_API_VERSION=Api Version
-CFG_BASE_PRODUCT_ID=Product Id
-CFG_BASE_PRODUCT_NAME=Product Name
-CFG_BASE_SOFTWARE_NUMBER=Software Number
-CFG_BASE_FIRMWARE_VERSION=Firmware Version
-CFG_BASE_PORT_VERSION=Port Version
-CFG_BASE_RF_VERSION=RF Version
-CFG_BASE_SERIAL_NUMBER=Serial Number
-CFG_BASE_SYSTEM_TIME=System Time
-CFG_BASE_DISPLAY_TIME=Display Time
-CFG_BASE_LANGUAGE=Language
-CFG_BASE_BATTERY_STATUS=Battery Status
-LANGUAGE_ENGLISH=English
-LANGUAGE_CZECH=Czech
-LANGUAGE_DANISH=Danish
-LANGUAGE_DUTCH=Dutch
-LANGUAGE_FINNISH=Finnish
-LANGUAGE_FRENCH=French
-LANGUAGE_FRENCH_CANADA=French (Canada)
-LANGUAGE_GERMAN=German
-LANGUAGE_HUNGARIAN=Hungarian
-LANGUAGE_ITALIAN=Italian
-LANGUAGE_NORVEGIAN=Norvegian
-LANGUAGE_POLISH=Polish
-LANGUAGE_PORTUGESE=Portugese
-LANGUAGE_PORTUGESE_BRAZIL=Portugese (Brazil)
-LANGUAGE_SLOVENE=Slovene
-LANGUAGE_SPANISH=Spanish
-LANGUAGE_SWEDISH=Swedish
-LANGUAGE_TURKISH=Turkish
-LANGUAGE_UNKNOWN=Unknown language [id=%s]
-CFG_BASE_GLUCOSE_UNIT=Glucose Unit
-GLUCOSE_UNIT_MGDL=mg/dL
-GLUCOSE_UNIT_MMOLL=mmol/L
-CFG_BASE_CLOCK_MODE=Clock Mode
-CLOCK_MODE_12H=12h
-CLOCK_MODE_24H=24h
-CFG_BASE_NONE=None
-DEVICE_NOT_FOUND_ON_CONFIGURED_PORT=Device Not Found On Configured Port or Port not found (%s)
-DEVICE_PORT_IN_USE=Selected port (%s) is in use and can't be claimed.
-CFG_SOUND_VOLUME_NA=Not Available
-CFG_SOUND_VOLUME_VIBRATE=Vibrate
-CFG_SOUND_VOLUME_LOW=Low
-CFG_SOUND_VOLUME_MEDIUM=Medium
-CFG_SOUND_VOLUME_HIGH=High
-CFG_SOUND_VOLUME_UNKNOWN=Unknown
-CFG_SOUND_VOLUME_DISABLED=Disabled
-CFG_SOUND_VOLUME_ENABLED=Enabled
-CFG_SOUND_VOLUME_FOR=Sound volume -
-
-CFG_BASE_FROM=From
-CFG_BASE_AMOUNT=Amount
-CFG_BASE_DELTA=Delta
-CFG_BASE_NAME=Name
-CFG_BASE_SLOT=Slot
-
-
-
-
-# !SG! Minimed Pump/CGMS
-
-CFG_MM_RF_ENABLED=RF Enabled
-CFG_MM_BLOCK_ENABLED=Settings Block Enabled
-CFG_MM_VOLTAGE_NORMAL_1_5_V=Normal 1.5 V
-CFG_BASE_VOLTAGE=Voltage
-CFG_BASE_BATTERY_STATUS_LOW=Low
-CFG_BASE_BATTERY_STATUS_NORMAL=Normal
-CFG_BASE_BATTERY_STATUS_OFF=Off
-CFG_BASE_BATTERY_STATUS_UNKNOWN=Unknown (%d)
-CFG_BASE_INVALID_VALUE=Invalid value: %s
-CFG_BASE_CARBOHYDRATE_UNIT=Carbohydrate Unit
-CFG_BASE_CARBOHYDRATE_UNIT_GRAMS=grams
-CFG_BASE_CARBOHYDRATE_UNIT_EXCH=exchange
-
-CFG_BASE_CARBOHYDRATE_UNIT_GRAMS_SHORT=g
-CFG_BASE_CARBOHYDRATE_UNIT_EXCH_SHORT=exch
-
-CFG_BASE_UNIT_UNIT_SHORT=U
-CFG_PARADIGM_LINK_ENABLE=Paradigm Link Enabled
-CFG_MM_KEYPAD_LOCKED=Keypad Locked
-
-PCFG_REMAINING_INSULIN=Remaining insulin
-PCFG_ALARM_CLOCK=Alarm Clock
-
-
-
-
-# OLD
-
-
-MM_DEVICE_INIT_PROBLEM=%s problem on initialization with %s:\n%s\n
-MM_INVALID_RETURN_VALUE=Invalid return value (%s), return value should be between %s and %s.
-MM_WRONG_STATE=Device is in wrong state for successful reading (current state=%s, required state=%s).
-MM_DEVICE_PUMP=Pump
-MM_DEVICE_CGMS=CGMS
-MM_PUMP_ERROR_REPLY=Error Reply
-MM_PUMP_STATE_REPLY=State Reply
-MM_ERROR_READING_DEVICE=Error on reading device.
-MM_SET_RF_POWER_ON=Set RF Power On
-
-MM_PUMP_DELIVERY_TBR=Check TBR delivery
-MM_PUMP_DELIVERING_TBR=Pump is currently delivering TBR and cannot communicate with computer.
\ No newline at end of file
Deleted: trunk/ggc-plugin_base/src/GGCPlugin_fr.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_fr.properties 2016-12-25 16:06:50 UTC (rev 1424)
+++ trunk/ggc-plugin_base/src/GGCPlugin_fr.properties 2016-12-25 16:11:36 UTC (rev 1425)
@@ -1,351 +0,0 @@
-#
-# ######################################################################
-# ### GGC PlugIn Base ###
-# ######################################################################
-# ### Language: French ###
-# ### Created by: F.A. ###
-# ### Last change: 16th April 2010 ###
-# ### Library Version: 0.4.5 ###
-# ### Application Version: 0.4.17 ###
-# ######################################################################
-#
-
-#
-COLLATION_RULES = < a,A,\u00e0,\u00c0,\u00e2,\u00c2 < b,B < c,C,\u00e7,\u00c7 < d,D <e,E,\u00e9,\u00c9,\u00e8,\u00c8,\u00ea,\u00ca,\u00eb,\u00cb < f,F < g,G < h,H < i,I,\u00ef,\u00cf < j,J < k,K < l,L < m,M < n,N < o,O,\u00f4,\u00d4 < p,P < q,Q < r,R < s,S < t,T < u,U,\u00fb,\u00db,\u00f9,\u00d9,\u00fc,\u00dc < v,V < w,W < x,X < y,Y < z,Z
-
-
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#
-# COMMENT: Need to be fixed prior to use. Some of this translations might be done in Core. We created this file from Meter
-# and Core. Translators need to fix this prior to first use on Translation Tool.
-# Andy
-#
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-
-
-
-
-
-#
-# !G! General (1)
-#
-
-# buttons
-CANCEL=Annuler
-OK=OK
-HELP=Aide
-CLOSE=Fermer
-APPLY=Appliquer
-LOG__=log:
-SELECT=S\u00E9lectionner
-ERROR=Erreur
-ADD=Ajouter
-EDIT=\u00C9diter
-DELETE=Supprimer
-NEXT=Suivant
-YES=Oui
-NO=Non
-WARNING=Attention
-
-UNIT_MMOLL=mmol/L
-UNIT_MGDL=mg/dL
-FALSE=Faux
-TRUE=Vrai
-
-
-DATE=Date
-TIME=Heure
-GRAPH=Graph
-
-
-# weeks days and months
-SU=Di
-MO=Lu
-TU=Ma
-WE=Me
-TH=Je
-FR=Ve
-SA=Sa
-JANUARY=Janvier
-FEBRUARY=F\u00E9vrier
-MARCH=Mars
-APRIL=Avril
-MAY=Mai
-JUNE=Juin
-JULY=Juillet
-AUGUST=Ao\u00FBt
-SEPTEMBER=Septembre
-OCTOBER=Octobre
-NOVEMBER=Novembre
-DECEMBER=D\u00E9cembre
-
-SELECT_ITEM_FIRST=Commencez par s\u00E9lectionner un \u00E9l\u00E9ment SVP
-ARE_YOU_SURE_DELETE=\u00CAtes vous s\u00FBr de vouloir supprimer cet \u00E9l\u00E9ment/saisie ?
-QUESTION=Question
-
-
-#
-# Configuration (1)
-#
-MY__=Mon
-DEVICE_COMPANY=Compagnie
-DEVICE_DEVICE=Dispositif
-NO_COMPANY_SELECTED=Aucune compagnie s\u00E9lectionn\u00E9e.
-NO_DEVICE_SELECTED=Aucun dispositif s\u00E9lectinn\u00E9.
-TIMEZONE_CONFIGURATION=Configuration Fuseau Horaire
-SELECT_ITEM_OR_CANCEL=S\u00E9l\u00E9ctionnez un \u00E9l\u00E9ment ou Annulez
-SELECT_MASS_STORAGE_DRIVE=S\u00E9lectionner le dispositif d'enregistrement
-SELECT_SERIAL_PORT=S\u00E9lectionner le Port S\u00E9rie
-SERIAL_PORT=Serial Port
-MASS_STORAGE_DRIVE=Dispositif d'enregistrement
-NEW__=Nouveau
-NOT_SET=Non d\u00E9fini!
-TIMEZONE_PREFERENCES=Pr\u00E9ferences Fuseau Horaire
-SELECT_TIMEZONE_LIST=S\u00E9lectionnez le bon Fuseau Horaire
-NEED_DAYLIGHTSAVING_FIX=La correction de l'enregistrement heure d'\u00E9t\u00E9 est-elle n\u00E9cessaire?
-WINTERTIME_FIX=Correction Heure d'hiver
-SUMMERTIME_FIX=Correction Heure d'\u00E9t\u00E9
-DEVICE_CONNECTION=Connexion du dispositif
-
-#
-# Ports
-#
-COMMUNICATION_PORT=Port de Communication
-
-
-#
-# Instructions Dialog (1)
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! Vous avez oubli\u00E9 de configurer votre lecteur %s\n et actuellement aucun %s n'est configur\u00E9\net/ou s\u00E9lectionn\u00E9. Veuillez v\u00E9rifier\net la configuration de votre %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Instructions du %s configur\u00E9
-CONFIGURED_DEVICE=Configured Device
-INSTRUCTIONS=Instructions for Download
-MY_DEVICE_NAME=My device name
-DEVICE_ICON=Image du %s
-DEVICE_NAME_=Device name
-CONNECTION_TYPE=Connection
-CONNECTION_PARAMETER=C. Parameter
-STATUS=Status
-DAYLIGHTSAVINGS_FIX=Time (DS) fix
-DS_NO=No
-DS_FIX_SHORT=Yes (W.=%s / S.=%s)
-DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s
-DEVICE_DOESNT_SUPPORT_DS_FIX=Device doesn't support Daylight savings fix !
-DEVICE_DOESNT_SUPPORT_DS_FIX_2=Device doesn't support Daylight savings fix
-INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your device entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html>
-START_DOWNLOAD=Start Download >>>
-WAIT_UNTIL_OLD_DATA_IS_READ=Please wait until old (existing) data is read!
-
-# status
-ERROR_IN_CONFIG=Error in config
-READY=Ready
-
-DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html>
-DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
-DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support import of data through files.<br></html>
-DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support download of configuration.<br></html>
-INTERNAL_CONFIGURATION_ERROR=<html>There seems to be internal problem<br>in configuration of application.<br></html>
-
-
-
-#
-# Transfer display (1)
-#
-ERROR_CONTACTING_DEVICE=Nous ne parvenons pas \u00E0 contacter le lecteur glyc\u00E9mique.\nVeuillez v\u00E9rifier le r\u00E9glage du port de communication\n(certains c\u00E2bles modifient leur adresse\nen se connectant). Renouvelez la configuration\net le probl\u00E8me devrait \u00EAtre r\u00E9solu !\n
-BREAK_COMMUNICATION=Interrompre la Communication
-EXPORT_DATA=Exporter les Donn\u00E9es
-DATA=Donn\u00E9es
-LOG=Log
-DEVICE_INFO=%s Info
-ACTION=Action
-READING_OLD_DATA=Reading old data (from Db)
-
-
-STATUS_NONE=Statut inconnu
-STATUS_READY=Pr\u00EAt
-STATUS_DOWNLOADING=Chargement
-STATUS_STOPPED_DEVICE=Chargement interrompu (par le dispositif)
-STATUS_STOPPED_USER=Chargement interroompu par l'utilisateur
-STATUS_DOWNLOAD_FINISHED=Chargement termin\u00E9
-STATUS_READER_ERROR=Erreur %s Interne (ou de port)
-
-UNKNOWN=Inconnu
-NEW=Nouveau
-CHANGED=Modifi\u00E9
-OLD=Ancien
-
-LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log n'est pas actuellement disponible.
-READ_DEVICE_DATA_TITLE=Lecture des donn\u00E9es [%s sur %s]
-SW_VERSION=SW Version
-HW_VERSION=HW Version
-SELECT_ALL=Tout S\u00E9lectionner
-DESELECT_ALL=Tout D\u00E9-s\u00E9lectionner
-FILTER=Filtrer
-FILTER_ALL=Tout
-FILTER_NEW=Nouveau
-FILTER_CHANGED=Modifi\u00E9
-FILTER_EXISTING=Ancien
-FILTER_UNKNOWN=Inconnu
-FILTER_NEW_CHANGED=Nouveau + Modifi\u00E9
-FILTER_ALL_BUT_EXISTING=Tout sauf Ancien
-
-#
-# File Selector
-#
-
-IMPORT_FILE_SELECTOR=Import File Selector
-IMPORT_FILE_SELECTOR_DESC=<html><body>Please select import file of selected type. </body></html>
-SELECT_FILE=Select file:
-BROWSE=Browse
-MULTIPLE_IMPORT_SELECTOR=Multiple Import Selector
-MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>This device has several possible import types. Please select correct import type, for import type you have available. </body></html>
-
-
-
-#
-# Export (1)
-#
-EXPORT_OUTPUT=Sortie \u00E0 Exporter
-#EXPORT_DEVICE_DATA=Donn\u00E9es %s Export\u00E9es
-GGC_APPLICATION=Application GGC
-EXPORT_PROGRESS=Progression de l'exportation
-START=D\u00E9but
-EXPORT_STATUS_READY=Pr\u00EAt
-EXPORT_STATUS_EXPORTING=Exportation en cours
-EXPORT_STATUS_FINISHED=Termin\u00E9
-
-
-
-
-#
-# List (1)
-#
-LEGEND_DESC=<html><b>Légnde :</b><br><font color="green">Vert</font> = Tous les dispositifs supportés connus<br><font color="#33FFFF">Cyan</font> = En test<br><font color="#660066">Magenta</font> = quelques dispositifs pris en charge<br><font color="blue">Bleu</font> = Travail en cours<br><font color="#FFCC33">Orange</font> = Pr\u00E9vu<br><font color="red">Red</font> = Non prévu</html>
-
-
-
-#
-# About (1)
-#
-SYSTEM_PROPERTIES=System Properties
-ABOUT=About
-PROPERTY=Property
-VALUE=Value
-LICENCE=Licence
-CREDITS=Credits
-LIBRARIES=Libraries
-GGC_DEVELOPMENT_TEAM=GGC Development Team
-SEE_CREDITS=(See Credits)
-DEVELOPERS_DESC=Developers & features they implemented
-HELPERS_DESC=People that helped (testing, lending or donating hardware,...)
-FEATURES=Features
-IMPLEMENTED_FEATURES=Implemented Features
-SUPPORTED_DEVICES=Supported Devices
-NOT_IMPLEMENTED_FEATURES=Not Implemented Features
-PLANNED_DEVICES=Planned Devices
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-
-
-#
-# Printing - Base (2)
-#
-DATE=Date
-PRINTING=Printing
-TYPE_OF_REPORT=Type Of Report
-SELECT_YEAR_AND_MONTH=Select Year And Month
-REPORT_FOOTER=Rapport cr\u00E9\u00E9 par "GGC - GNU Gluco Control", logiciel libre disponible sur http://ggc.sourceforge.net
-FOR=For
-PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html>
-PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html>
-PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html>
-SELECT_STARTING_RANGE=Select starting range
-SELECT_ENDING_RANGE=Select ending range
-
-
-#
-# Meter Interfaces (1)
-#
-SERIAL_PORTS=Serial Ports: COM2,...
-MASS_STORAGE=Mass Storage: G:,...
-
-
-#
-# Used protocols (1)
-#
-PROT_NONE=None (dummy or N/A)
-PROT_SERIAL_BRIDGE=Serial (or USB bridge)
-PROT_MASS_STORAGE_XML=Mass Storage (Xml)
-PROT_BLUE_TOOTH=BlueTooth
-PROT_BLUETOOTH_SERIAL=BlueTooth/Serial
-
-
-#
-# Libraries (1)
-#
-NO_BINARY_PART_FOUND=Meter devices are using special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n\\lib\\native\\%s and look for\nfile: %s. If it's not there you must\nobtain it, if it is there, then there is\nsomething wrong with it.\n
-
-
-
-#
-# Special Comments
-#
-DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated.
-DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device.
-
-
-#
-# Error Dialog (1)
-#
-ERROR_DIALOG=Error Dialog
-DETAILS=Details
-ERROR_SOLUTION=Solution
-EXCEPTION_LOG=Exception (Stack) Trace
-SEND_TO_SERVER=Send to Server
-SENDING_TO_SERVER=Sending to Server
-SEND_TO_SERVER_TEXT=<html>This part is not implemented yet. But at later time when<br>this works, you will able to send us report of error<br>and receive solution (if it exists).<br></html>
-NO_SOLUTION_AVAILABLE=No solution available.
-ERROR_COUNT=Errors (%s)
-
-
-#
-# Devices
-#
-
-# Smart pix
-PIX_ABORT_AUTOSCAN=Autoscan aborted
-PIX_DETECT_DEVICES=Detecting devices
-PIX_UNRECOVERABLE_ERROR=Unrecoverable error
-PIX_READING_ELEMENT=Reading elements from device
-# S_ (%s)
-PIX_FINISHED_REPORT_READY=Finished reading. Report ready.
-PIX_FINISHED_READING=Finished reading. Report ready.
-PIX_READING=Read data
-PIX_SCANNING=Scanning for device
-PIX_CREATING_REPORT=Creating report
-PIX_DEVICE_NOT_FOUND=Device not found
-
-
-
-#
-# Device Events (2)
-#
-EVENT_TYPE=Event Type
-EVENT_POWER_DOWN=Power Down
-EVENT_POWER_UP=Power Up
-EVENT_DATETIME_SET=Date/Time Set
-EVENT_DATETIME_CORRECT=Date/Time Corrected
-EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back
-EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward
-EVENT_DATETIME_CHANGED=Date/Time Changed
-EVENT_SELF_TEST=%s Self-test
-EVENT_DOWNLOAD=%s Data Download
-EVENT_BATTERY_REMOVED=Battery removed
-EVENT_BATTERY_REPLACED=Battery replaced
-EVENT_BATTERY_LOW=Battery low
-EVENT_BATTERY_LOW_DESC=Battery low (%s)
-
Deleted: trunk/ggc-plugin_base/src/GGCPlugin_si.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_si.properties 2016-12-25 16:06:50 UTC (rev 1424)
+++ trunk/ggc-plugin_base/src/GGCPlugin_si.properties 2016-12-25 16:11:36 UTC (rev 1425)
@@ -1,415 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: Sloevene ###
-# ### Created by: Andy (an...@t-...) ###
-# ### Version: 0.6.1 ###
-# ### Last change: 6.7.2013 19:47:59 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 264
-# Not translated: 19 (7 %)
-# Need to be checked: 0 (0 %)
-#
-# Translated: 245 (92 %)
-#
-#
-# This comment will be displayed after header
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< a,A < b,B < c,C < \u010D,\u010C < d,D < e,E < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O < p,P < q,Q < r,R < s,S < \u0161,\u0160 < t,T < u,U < v,V < w,W < x,X < y,Y < z,Z < \u017E,\u017D
-
-#
-# General [1]
-#
-
-# buttons and general stuff
-CANCEL=Prekini
-OK=OK
-HELP=Pomo\u010D
-CLOSE=Zapri
-APPLY=Prevzemi
-LOG__=log:
-SELECT=Izberi
-ERROR=Napaka
-ADD=Dodaj
-EDIT=Spremeni
-DELETE=Zbri\u0161i
-NEXT=Nasl.
-YES=Da
-NO=Ne
-WARNING=Opozorilo
-UNIT_MMOLL=mmol/L
-UNIT_MGDL=mg/dL
-FALSE=Napa\u010Dno
-TRUE=Pravilno
-DATE=Datum
-TIME=\u010Cas
-GRAPH=Graf
-SELECT_ITEM_FIRST=Prosimo najprej izberite vnos.
-ARE_YOU_SURE_DELETE=Ste prepri\u010Dani da \u017Eelite odstraniti ta vnos?
-QUESTION=Vpra\u0161anje
-INFORMATION=Informacija
-INVALID_DATA=Napa\u010Dni podatek
-VERSION=Verzija
-
-# weeks days and months
-SU=Ne
-MO=Po
-TU=To
-WE=Sr
-TH=\u010Ce
-FR=Pe
-SA=So
-
-
-JANUARY=Januar
-FEBRUARY=Februar
-MARCH=Marec
-APRIL=April
-MAY=Maj
-JUNE=Junij
-JULY=Julij
-AUGUST=Avgust
-SEPTEMBER=September
-OCTOBER=Oktober
-NOVEMBER=November
-DECEMBER=December
-
-#
-# Configuration [1]
-#
-MY__=Moj
-DEVICE_COMPANY=Podjetje
-DEVICE_DEVICE=Naprava
-NO_COMPANY_SELECTED=Nobeno podjetje ni izbrano.
-NO_DEVICE_SELECTED=Nobena naprava ni izbrana.
-TIMEZONE_CONFIGURATION=Nastavitev \u010Dasovne cone
-SELECT_ITEM_OR_CANCEL=Izberi en element ali uporabi Prekini opcijo.
-SELECT_MASS_STORAGE_DRIVE=Izberi Mass Storage napravo
-SELECT_SERIAL_PORT=Izberi Serijska Vrata
-SERIAL_PORT=Serijska Vrata
-MASS_STORAGE_DRIVE=Mass Storage naprava
-NEW__=Nov
-NOT_SET=Ni nastavljeno !
-TIMEZONE_PREFERENCES=Nastavitve \u010Dasovne cone
-SELECT_TIMEZONE_LIST=Izberite pravilno \u010Dasovno cono
-NEED_DAYLIGHTSAVING_FIX=Potrebujemo avtomatsko popravilo \u010Dasa (letni/zimski)?
-WINTERTIME_FIX=Popravilo zimskega \u010Dasa
-SUMMERTIME_FIX=Popravilo letnega \u010Dasa
-DEVICE_CONNECTION=Tip povezave
-CUSTOM_NAME=Poljubno ime
-COMMUNICATION_SETTINGS=Komunikacijske nastavitve
-CONFIG_ERROR_NO_DEVICE_OR_PARAMETERS=<html>Konfiguracijska napaka:<br>Verjetno niste izbrali naprave, ali pa niste pravilno<br>\nnastavili vseh zahtevanih nastavitev.<br></html>
-DEVICE_VERSION=Verzija naprave
-
-#
-# Ports [1]
-#
-COMMUNICATION_PORT=Komunikacijska vrata
-
-#
-# Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Ups! Pozabili ste nastaviti svoj merilec\nin trenutno ni nobenega nastavljenega\nin/ali izbranega. Obi\u0161cite konfiguracijo\nin nastavite va\u0161 merilec.\n
-CONFIGURED_DEVICE_INSTRUCTIONS=Nastavljen %s in navodila
-CONFIGURED_DEVICE=Nastavljen merilec
-INSTRUCTIONS=Navodila za prenos podatkov
-MY_DEVICE_NAME=Moje ime
-DEVICE_ICON=Slika merilca
-DEVICE_NAME_=Ime naprave
-CONNECTION_TYPE=Povezava
-CONNECTION_PARAMETER=Vrata
-STATUS=Status
-DAYLIGHTSAVINGS_FIX=Popravilo \u010Dasa
-DS_NO=Ne
-DS_FIX_SHORT=Ja (Z.=%s / L.=%s)
-DS_FIX_LONG=Ja (Popravilo pozimi=%s / Popravilo poleti=%s). \u010Casovna cona: %s
-DEVICE_DOESNT_SUPPORT_DS_FIX=Ni podprto s strani naprave.
-DEVICE_DOESNT_SUPPORT_DS_FIX_2=Naprava ne podpira popravila \u010Dasa
-INSTRUCTIONS_DESC=<html>Na zgornji desni strani lahko vidite va\u0161o konfiguracijo. \u010Ce status ni 'Pripravljeno' potem imamo problem s konfiguracijo. Prosim zaprite okno in za\u017Eenite konfiguracijo znova. \u010Ce je problem \u0161e vedno prisoten kontaktirajte podporo (poglejte Dokumentacijo). Na spodnji desni strani lahko vidite navodila kako priklju\u010Diti merilec na va\u0161 ra\u010Dunalnik. Prosim pazljivo jim sledite in ko ste kon\u010Dali kliknite na 'Za\u010Detek prenosa'. Odprlo se bo naslednjo okno, kjer se bodo vrednosti iz merilca prikazovale. Vsi podatki so samo prikazani dokler ne kliknete na tipko 'Izvozi podatke'.</html>
-START_DOWNLOAD=Za\u010Detek prenosa >>>
-WAIT_UNTIL_DEVICE_PREINIT=Prosim po\u010Dakajte dokler ni naprava pripravljena!
-
-# status
-ERROR_IN_CONFIG=Napaka v konfiguraciji
-READY=Pripravljeno
-
-# Download support
-DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Va\u0161a izbrana naprava (%s [%s])<br>ne podpira prenosa podatkov.<br></html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC v tem trenutku ne podpira prenosa prenosa<br>podatkov iz izbrane naprave (%s [%s]).<br>Preverite seznam naprav in preverite ali je<br>podpora v na\u010Drtu ali nas kontaktirajte za<br>dodatne podatke.</html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generi\u010Dne naprave ne podpirajo prenosa podatkov.<br>Izberite "pravo" napravo in poskusite znova.<br></html>
-DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Va\u0161a izbrana naprava (%s [%s])<br>ne podpira prenosa podatkov.<br></html>
-DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Va\u0161a izbrana naprava (%s [%s])<br>ne podpira uvoza podatkov preko datoteke.<br></html>
-DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Va\u0161a izbrana naprava (%s [%s])<br>ne podpira prenosa nastavitev.<br></html>
-INTERNAL_CONFIGURATION_ERROR=<html>Zgleda da imamo interni problem<br>pri konfiguraciji aplikacije.<br></html>
-
-#
-# File Selector [1]
-#
-IMPORT_FILE_SELECTOR=Izbira uvozne datoteke
-IMPORT_FILE_SELECTOR_DESC=<html><body>Prosim izberite uvozno datoteko izbranega tipa.</body></html>
-SELECT_FILE=Izberi datoteko:
-BROWSE=Brskaj
-MULTIPLE_IMPORT_SELECTOR=Izbira tipa uvozne datoteke
-MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>Ta naprava ima ve\u010D razli\u010Dnih tipov za uvoz. Prosim izberite uvozni format, ki ustreza va\u0161i datoteki.</body></html>
-
-#
-# Transfer display [1]
-#
-ERROR_CONTACTING_DEVICE=Imeli smo problem pri kontaktiranju merilca.\nProsim preverite nastavitve komunikacijskih vrat\n(nekateri kabli lahko spremenijo vrata, ko\njih znova priklju\u010Dimo). Za\u017Eenite konfiguracijo\nin problem bo verjetno re\u0161en.\n
-BREAK_COMMUNICATION=Prekini prenos
-EXPORT_DATA=Izvozi podatke
-DATA=Podatki
-LOG=Dnevnik
-DEVICE_INFO=Podatki merilca
-ACTION=Akcija
-READING_OLD_DATA=Berem stare podatke (iz baze)
-STATUS_NONE=Neznan status
-STATUS_READY=Pripravljeno
-STATUS_DOWNLOADING=Nalaganje (download)
-STATUS_STOPPED_DEVICE=Nalaganje prekinjeno (naprava)
-STATUS_STOPPED_USER=Nalaganje prekinjeno s strani uporabnika
-STATUS_DOWNLOAD_FINISHED=Nalaganje zaklju\u010Deno
-STATUS_READER_ERROR=Interna napaka na merilcu (ali portu)
-UNKNOWN=Neznan
-NEW=Nov
-CHANGED=Spremenjen
-OLD=Star
-LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Dnevnik trenutno \u0161e ne deluje.
-READ_D...
[truncated message content] |
|
From: <and...@us...> - 2016-12-25 16:21:29
|
Revision: 1426
http://sourceforge.net/p/ggc/code/1426
Author: andyrozman
Date: 2016-12-25 16:21:27 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Future
- future module
Added Paths:
-----------
trunk/ggc-future/
trunk/ggc-future/pom.xml
Added: trunk/ggc-future/pom.xml
===================================================================
--- trunk/ggc-future/pom.xml (rev 0)
+++ trunk/ggc-future/pom.xml 2016-12-25 16:21:27 UTC (rev 1426)
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-root</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>GGC Future Modules</name>
+ <artifactId>ggc-future</artifactId>
+ <packaging>pom</packaging>
+
+ <!--
+ <modules>
+ <module>ggc-help</module>
+ </modules>
+ -->
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 16:58:51
|
Revision: 1428
http://sourceforge.net/p/ggc/code/1428
Author: andyrozman
Date: 2016-12-25 16:58:49 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Plugins
- moved meters
Modified Paths:
--------------
trunk/ggc-plugins/ggc-meter/build/build.xml
trunk/ggc-plugins/ggc-meter/pom.xml
trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntry.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntrySpecial.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/MeterPluginDefinition.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/abbott/OptiumXceed.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaDecoder.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
trunk/ggc-plugins/ggc-plugins-base/pom.xml
trunk/ggc-plugins/pom.xml
Added Paths:
-----------
trunk/ggc-plugins/ggc-meter/
trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/GlucoseMeterMarkerDto.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/GlucoseMeterMarker.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/SerialMeterAbstract.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/UsbMeterAbstract.java
trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/GlucoseMeterMarkerHandler.java
Removed Paths:
-------------
trunk/ggc-meter/
trunk/ggc-plugin_base/
Property Changed:
----------------
trunk/ggc-plugins/
Index: trunk/ggc-plugins
===================================================================
--- trunk/ggc-plugins 2016-12-25 16:39:02 UTC (rev 1427)
+++ trunk/ggc-plugins 2016-12-25 16:58:49 UTC (rev 1428)
Property changes on: trunk/ggc-plugins
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*.iml
Modified: trunk/ggc-plugins/ggc-meter/build/build.xml
===================================================================
--- trunk/ggc-meter/build/build.xml 2016-12-25 13:37:33 UTC (rev 1420)
+++ trunk/ggc-plugins/ggc-meter/build/build.xml 2016-12-25 16:58:49 UTC (rev 1428)
@@ -1,15 +1,15 @@
<?xml version="1.0" ?>
-<project name="GNU PlugIn Base" default="build" basedir=".">
+<project name="GNU PlugIn Base" default="build" basedir="">
<description>
Build file for GGC
</description>
<!-- Environment properties read from a file ...-->
<property file="../../build/AtechTools.properties"/>
- <property file="../../ggc-core/build/GGC_Core_Version.properties"/>
- <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/>
- <property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/>
- <property file="./GGCMeterToolVersion.properties"/>
+ <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/>
+ <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseBuild.properties"/>
+ <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/>
+ <property file="GGCMeterToolVersion.properties"/>
<!-- These should *not* be modified on the command line! -->
Modified: trunk/ggc-plugins/ggc-meter/pom.xml
===================================================================
--- trunk/ggc-meter/pom.xml 2016-12-25 13:37:33 UTC (rev 1420)
+++ trunk/ggc-plugins/ggc-meter/pom.xml 2016-12-25 16:58:49 UTC (rev 1428)
@@ -7,7 +7,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-parent</artifactId>
<version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath>
</parent>
<name>GGC Meter Tool Project</name>
Added: trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/GlucoseMeterMarkerDto.java
===================================================================
--- trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/GlucoseMeterMarkerDto.java (rev 0)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/GlucoseMeterMarkerDto.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -0,0 +1,39 @@
+package ggc.meter.data;
+
+import ggc.meter.defs.GlucoseMeterMarker;
+
+/**
+ * Created by andy on 12/11/16.
+ */
+public class GlucoseMeterMarkerDto
+{
+
+ GlucoseMeterMarker markerType;
+ String data;
+
+
+ public GlucoseMeterMarkerDto(GlucoseMeterMarker markerType)
+ {
+ this(markerType, null);
+ }
+
+
+ public GlucoseMeterMarkerDto(GlucoseMeterMarker markerType, String data)
+ {
+ this.markerType = markerType;
+ this.data = data;
+ }
+
+
+ public static GlucoseMeterMarkerDto createMarker(GlucoseMeterMarker markerType)
+ {
+ return new GlucoseMeterMarkerDto(markerType);
+ }
+
+
+ public static GlucoseMeterMarkerDto createMarker(GlucoseMeterMarker markerType, String data)
+ {
+ return new GlucoseMeterMarkerDto(markerType, data);
+ }
+
+}
Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntry.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/data/MeterValuesEntry.java 2016-12-25 13:37:33 UTC (rev 1420)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntry.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -1,18 +1,17 @@
package ggc.meter.data;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
+import java.util.*;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import com.atech.db.ext.ExtendedHandler;
+import com.atech.data.GsonUtils;
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.data.ATechDate;
import com.atech.utils.data.ATechDateType;
-import ggc.core.data.defs.DailyValuesExtendedType;
+import ggc.core.data.ExtendedDailyValueHandler;
+import ggc.core.data.ExtendedDailyValueType;
import ggc.core.data.defs.GlucoseUnitType;
import ggc.core.db.hibernate.DayValueH;
import ggc.meter.util.DataAccessMeter;
@@ -51,7 +50,7 @@
private static DataAccessMeter da = DataAccessMeter.getInstance();
private static I18nControlAbstract ic = da.getI18nControlInstance();
- private static ExtendedHandler extendedDailyValueHandler = da.getExtendedDailyValueHandler();
+ private static ExtendedDailyValueHandler extendedDailyValueHandler = da.getExtendedDailyValueHandler();
private ATechDate datetime;
private Integer bgOriginal = null;
@@ -59,8 +58,9 @@
private Hashtable<String, String> params;
private Float bgMmolL;
public DayValueH entry_object = null;
- private HashMap<String, String> extendedMap;
+ private Map<ExtendedDailyValueType, String> extendedMap;
public MeterValuesEntryDataType extendedType = MeterValuesEntryDataType.None;
+ public List<GlucoseMeterMarkerDto> glucoseMarkers;
/**
@@ -811,13 +811,15 @@
return false;
}
else
- return extendedDailyValueHandler.isExtendedValueSet(DailyValuesExtendedType.Urine.getCode(), extendedMap);
+ return extendedDailyValueHandler.isExtendedValueSet(ExtendedDailyValueType.Urine, extendedMap)
+ || extendedDailyValueHandler.isExtendedValueSet(ExtendedDailyValueType.Urine_mmolL, extendedMap)
+ || extendedDailyValueHandler.isExtendedValueSet(ExtendedDailyValueType.Urine_mgdL, extendedMap);
}
public String getUrineValue()
{
- return extendedDailyValueHandler.getExtendedValue(DailyValuesExtendedType.Urine.getCode(), extendedMap);
+ return extendedDailyValueHandler.getExtendedValue(ExtendedDailyValueType.Urine, extendedMap);
}
@@ -838,33 +840,36 @@
}
else
{
- this.extendedMap = new HashMap<String, String>();
+ this.extendedMap = new HashMap<ExtendedDailyValueType, String>();
}
- this.extendedDailyValueHandler.setExtendedValue(DailyValuesExtendedType.Source.getCode(), //
+ loadGlucoseMarkers();
+
+ extendedDailyValueHandler.setExtendedValue(ExtendedDailyValueType.Source, //
DataAccessMeter.getInstance().getSourceDevice(), this.extendedMap);
}
- public void setUrine(DailyValuesExtendedType entryType, String value)
+ public void setUrine(ExtendedDailyValueType entryType, String value)
{
- String valueFull = null;
- if (entryType == DailyValuesExtendedType.Urine)
- {
- valueFull = value;
- }
- else if (entryType == DailyValuesExtendedType.Urine_mgdL)
- {
- valueFull = value + " " + "mg/dL";
- }
- else
- // if (entryType == DailyValuesExtendedType.Urine_mgdL)
- {
- valueFull = value + " " + "mmol/L";
- }
+ // String valueFull = null;
+ //
+ // if (entryType == ExtendedDailyValueType.Urine)
+ // {
+ // valueFull = value;
+ // }
+ // else if (entryType == ExtendedDailyValueType.Urine_mgdL)
+ // {
+ // valueFull = value + " " + "mg/dL";
+ // }
+ // else
+ // // if (entryType == DailyValuesExtendedType.Urine_mgdL)
+ // {
+ // valueFull = value + " " + "mmol/L";
+ // }
+ //
+ extendedDailyValueHandler.setExtendedValue(entryType, value, extendedMap);
- extendedDailyValueHandler.setExtendedValue(entryType.getCode(), valueFull, extendedMap);
-
resetExtendedType();
}
@@ -1007,6 +1012,7 @@
*/
public String createExtendedValueDailyValuesH()
{
+ saveGlucoseMarkers();
return extendedDailyValueHandler.saveExtended(extendedMap);
}
@@ -1168,8 +1174,7 @@
break;
case Urine:
- extendedDailyValueHandler.setExtendedValue(DailyValuesExtendedType.Urine.getCode(), (String) value,
- extendedMap);
+ extendedDailyValueHandler.setExtendedValue(ExtendedDailyValueType.Urine, (String) value, extendedMap);
break;
default:
@@ -1207,4 +1212,32 @@
return bgMmolL;
}
+
+ public void addGlucoseMeterMarker(GlucoseMeterMarkerDto marker)
+ {
+ if (this.glucoseMarkers == null)
+ {
+ this.glucoseMarkers = new ArrayList<GlucoseMeterMarkerDto>();
+ }
+
+ this.glucoseMarkers.add(marker);
+ }
+
+
+ public void loadGlucoseMarkers()
+ {
+ if (extendedDailyValueHandler.isExtendedValueSet(ExtendedDailyValueType.GlucometerMarkers, extendedMap))
+ {
+ this.glucoseMarkers = GsonUtils.getListOfType( //
+ extendedDailyValueHandler.getExtendedValue(ExtendedDailyValueType.GlucometerMarkers, extendedMap), //
+ GlucoseMeterMarkerDto.class);
+ }
+ }
+
+
+ public void saveGlucoseMarkers()
+ {
+ extendedDailyValueHandler.setExtendedValue(ExtendedDailyValueType.GlucometerMarkers, null, extendedMap);
+ }
+
}
Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntrySpecial.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/data/MeterValuesEntrySpecial.java 2016-12-25 13:37:33 UTC (rev 1420)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/data/MeterValuesEntrySpecial.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -1,10 +1,10 @@
package ggc.meter.data;
-import ggc.core.data.ExtendedDailyValueHandler;
+import java.util.Hashtable;
+
+import ggc.core.data.ExtendedDailyValueType;
import ggc.meter.util.DataAccessMeter;
-import java.util.Hashtable;
-
/**
* Application: GGC - GNU Gluco Control
* Plug-in: Meter Tool (support for Meter devices)
@@ -104,6 +104,7 @@
// String>();
static Hashtable<String, String> allowed_types = null;
+
/**
* Constructor
*
@@ -124,6 +125,7 @@
}
}
+
/**
* Get Allowed Pump Mapped Types
*
@@ -142,6 +144,7 @@
return allowed_types;
}
+
private void processUrine(String value)
{
if (value.toLowerCase().contains("mmol/"))
@@ -169,24 +172,25 @@
}
}
+
/**
* Which Special is DVE
- *
+ *
* @param dv_type
* @return
*/
- public int whichSpecialIsDVE(int dv_type)
- {
- switch (dv_type)
- {
- case ExtendedDailyValueHandler.EXTENDED_URINE:
- return SPECIAL_ENTRY_URINE_COMBINED;
+ // public int whichSpecialIsDVE(int dv_type)
+ // {
+ // switch (dv_type)
+ // {
+ // case ExtendedDailyValueHandler.EXTENDED_URINE:
+ // return SPECIAL_ENTRY_URINE_COMBINED;
+ //
+ // default:
+ // return -1;
+ // }
+ // }
- default:
- return -1;
- }
- }
-
/**
* Do we Transfer Units For Special Entry
*
@@ -197,6 +201,7 @@
return special_entries.get("" + this.special_entry_id).transfer_unit;
}
+
/**
* Get Pump Mapped Type
*
@@ -207,6 +212,7 @@
return special_entries.get("" + this.special_entry_id).pump_map;
}
+
/**
* Set Date Time
*
@@ -217,6 +223,7 @@
this.datetime_tag = dt;
}
+
/**
* Get Pump Compare Id
*
@@ -227,6 +234,7 @@
return this.datetime_tag * 100 + "_" + getPumpMappedType();
}
+
/**
* Get Special Entry DbEntry
* @return
@@ -249,21 +257,22 @@
return sb.toString();
}
+
private void initSpecialEntries()
{
if (special_entries == null)
{
special_entries = new Hashtable<String, SpecialEntryDefinition>();
special_entries.put("1", new SpecialEntryDefinition(1, "URINE", "mmol/L", true, 4,
- ExtendedDailyValueHandler.EXTENDED_URINE, SpecialEntryDefinition.TYPE_STRING));
+ ExtendedDailyValueType.Urine_mmolL, SpecialEntryDefinition.TYPE_STRING));
special_entries.put("2", new SpecialEntryDefinition(2, "URINE", "mg/dL", true, 4,
- ExtendedDailyValueHandler.EXTENDED_URINE, SpecialEntryDefinition.TYPE_STRING));
- special_entries.put("3", new SpecialEntryDefinition(3, "URINE", "", false, 4,
- ExtendedDailyValueHandler.EXTENDED_URINE, SpecialEntryDefinition.TYPE_STRING));
- special_entries.put("4", new SpecialEntryDefinition(4, "CH", "g", false, 5, -1,
- SpecialEntryDefinition.TYPE_DECIMAL_1));
- special_entries.put("-2", new SpecialEntryDefinition(-2, "BG", "", false, 3, -1,
- SpecialEntryDefinition.TYPE_INTEGER));
+ ExtendedDailyValueType.Urine_mgdL, SpecialEntryDefinition.TYPE_STRING));
+ special_entries.put("3", new SpecialEntryDefinition(3, "URINE", "", false, 4, ExtendedDailyValueType.Urine,
+ SpecialEntryDefinition.TYPE_STRING));
+ special_entries.put("4",
+ new SpecialEntryDefinition(4, "CH", "g", false, 5, null, SpecialEntryDefinition.TYPE_DECIMAL_1));
+ special_entries.put("-2",
+ new SpecialEntryDefinition(-2, "BG", "", false, 3, null, SpecialEntryDefinition.TYPE_INTEGER));
}
// Hashtable<String, String> special_entry_tags = new Hashtable<String,
@@ -271,6 +280,7 @@
}
+
/**
* Get Packed Value
*
@@ -287,6 +297,7 @@
return v;
}
+
/**
* get Value Value
* @return
@@ -302,15 +313,13 @@
}
else if (special_entries.get("" + this.special_entry_id).type == SpecialEntryDefinition.TYPE_DECIMAL_1)
{
- v = ""
- + da.getDecimalHandler().getDecimalAsString(
- da.getFloatValueFromString(this.special_entry_value.trim(), 0.0f) * 1.0f, 1);
+ v = "" + da.getDecimalHandler()
+ .getDecimalAsString(da.getFloatValueFromString(this.special_entry_value.trim(), 0.0f) * 1.0f, 1);
}
else if (special_entries.get("" + this.special_entry_id).type == SpecialEntryDefinition.TYPE_DECIMAL_2)
{
- v = ""
- + da.getDecimalHandler().getDecimalAsString(
- da.getFloatValueFromString(this.special_entry_value.trim(), 0.0f) * 1.0f, 2);
+ v = "" + da.getDecimalHandler()
+ .getDecimalAsString(da.getFloatValueFromString(this.special_entry_value.trim(), 0.0f) * 1.0f, 2);
}
else
{
@@ -320,6 +329,7 @@
return v;
}
+
/**
* Get Type Description
*
@@ -331,6 +341,7 @@
.getMessage(special_entries.get("" + this.special_entry_id).tag);
}
+
/**
* Get Extended Freetype description
*
@@ -343,12 +354,14 @@
private class SpecialEntryDefinition
{
+
public int id;
public String tag;
public String unit;
boolean transfer_unit;
public int pump_map;
- public int dailyvalue_ext_map;
+ public ExtendedDailyValueType dailyValueExtendedMap;
+ // public int dailyvalue_ext_map;
public int type;
public static final int TYPE_DECIMAL_1 = 1;
@@ -356,6 +369,7 @@
public static final int TYPE_STRING = 3;
public static final int TYPE_INTEGER = 4;
+
/*
* public SpecialEntryDefinition(int id_, String tag_, String unit_,
* boolean transfer_unit_ )
@@ -365,14 +379,14 @@
*/
public SpecialEntryDefinition(int id_, String tag_, String unit_, boolean transfer_unit_, int pump_map_,
- int dv_ext_map, int type_)
+ ExtendedDailyValueType dailyValueExtendedMap, int type_)
{
this.id = id_;
this.tag = tag_;
this.unit = unit_;
this.transfer_unit = transfer_unit_;
this.pump_map = pump_map_;
- this.dailyvalue_ext_map = dv_ext_map;
+ this.dailyValueExtendedMap = dailyValueExtendedMap;
this.type = type_;
}
Added: trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/GlucoseMeterMarker.java
===================================================================
--- trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/GlucoseMeterMarker.java (rev 0)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/GlucoseMeterMarker.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -0,0 +1,34 @@
+package ggc.meter.defs;
+
+/**
+ * Created by andy on 12/11/16.
+ */
+public enum GlucoseMeterMarker
+{
+
+ LowGlucose("MARKER_LO"), //
+ HighGlucose("MARKER_HI"), //
+ PreMeal("MARKER_PRE_MEAL"), //
+ PostMeal("MARKER_POST_MEAL"), //
+ DontFeelRight("MARKER_DONT_FEEL_RIGHT"), //
+ Sick("MARKER_SICK"), //
+ Stress("MARKER_STRESS"), //
+ Activity("MARKER_ACTIVITY"), //
+ ControlResult("MARKER_CONTROL_RESULT"), //
+ AfterFoodWithTime("MARKER_AFTER_FOOD"), //
+ ;
+
+ private String description;
+
+
+ GlucoseMeterMarker(String description)
+ {
+ this.description = description;
+ }
+
+
+ public String getDescription()
+ {
+ return description;
+ }
+}
Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/MeterPluginDefinition.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/defs/MeterPluginDefinition.java 2016-12-25 13:37:33 UTC (rev 1420)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/defs/MeterPluginDefinition.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -127,8 +127,10 @@
{
List<FeaturesEntry> outList = new ArrayList<FeaturesEntry>();
- outList.add(new FeaturesEntry("LifeScan: Ultra2 (in 2016)"));
- outList.add(new FeaturesEntry("Wellion: Calla, Luna (in 2016 ?)"));
+ outList.add(new FeaturesEntry("LifeScan: Ultra2 (in 2017)"));
+ outList.add(new FeaturesEntry("Wellion: Calla, Luna (in 2017 ?)"));
+ outList.add(new FeaturesEntry("Menarini: most newer models (in 2017 ?)"));
+ outList.add(new FeaturesEntry("Arkray: some models (in 2017 ?)"));
return outList;
}
Added: trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/SerialMeterAbstract.java
===================================================================
--- trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/SerialMeterAbstract.java (rev 0)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/SerialMeterAbstract.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -0,0 +1,256 @@
+package ggc.meter.device;
+
+import java.io.EOFException;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.atech.utils.data.ATechDate;
+import com.atech.utils.data.ATechDateType;
+
+import ggc.core.data.defs.GlucoseUnitType;
+import ggc.meter.data.MeterValuesEntry;
+import ggc.meter.data.defs.MeterDeviceDefinition;
+import ggc.meter.util.DataAccessMeter;
+import ggc.plugin.comm.NRSerialCommunicationHandler;
+import ggc.plugin.comm.cfg.SerialSettings;
+import ggc.plugin.data.enums.PlugInExceptionType;
+import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.output.OutputWriter;
+
+/**
+ * This is abstract class for serial meters, that works with new CommunicationHandler
+ * framework (MeterInterface2).
+ */
+public abstract class SerialMeterAbstract
+{
+
+ private static final Logger LOG = LoggerFactory.getLogger(SerialMeterAbstract.class);
+
+ protected DataAccessMeter dataAccess;
+ protected OutputWriter outputWriter;
+ protected NRSerialCommunicationHandler communicationHandler;
+ protected String portName;
+ protected boolean active = false;
+ protected String serialNumber;
+ protected MeterDeviceDefinition deviceDefinition;
+ protected GlucoseUnitType glucoseUnitType;
+ private int receiveTimeout;
+
+
+ public SerialMeterAbstract(DataAccessMeter dataAccess, OutputWriter outputWriter, String portName,
+ MeterDeviceDefinition deviceDefinition)
+ {
+ this.dataAccess = dataAccess;
+ this.outputWriter = outputWriter;
+ this.portName = portName;
+ this.deviceDefinition = deviceDefinition;
+ }
+
+
+ public void readData() throws PlugInBaseException
+ {
+ checkIfDevicePresentOnConfiguredPort();
+ connectDevice();
+ preInitDevice();
+ readDeviceData();
+ }
+
+
+ private void connectDevice()
+ {
+ communicationHandler = new NRSerialCommunicationHandler(portName, getSerialSettings());
+ communicationHandler.connectAndInitDevice();
+ this.active = true;
+ }
+
+
+ protected abstract void preInitDevice() throws PlugInBaseException;
+
+
+ private void checkIfDevicePresentOnConfiguredPort() throws PlugInBaseException
+ {
+ Set<String> availablePorts = NRSerialCommunicationHandler.getAvailablePorts();
+
+ boolean found = false;
+
+ for (String port : availablePorts)
+ {
+ if (port.equalsIgnoreCase(portName))
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ throw new PlugInBaseException(PlugInExceptionType.DeviceNotFoundOnConfiguredPort);
+ // if (availablePorts.size() > 0)
+ // {
+ //
+ // }
+ // else
+ // {
+ // throw new
+ // PlugInBaseException(PlugInExceptionType.DeviceNotFoundOnConfiguredPort);
+ // }
+ }
+ }
+
+
+ public abstract void readDeviceData() throws PlugInBaseException;
+
+
+ protected void setReceiveTimeout(int timeout) throws PlugInBaseException
+ {
+ this.receiveTimeout = timeout;
+ this.communicationHandler.setReceiveTimeout(timeout);
+ }
+
+
+ protected byte readByte() throws Exception
+ {
+ int rv = -1;
+ long startMs = System.currentTimeMillis();
+
+ do
+ {
+ rv = this.communicationHandler.read();
+
+ if (rv != -1)
+ {
+ return (byte) rv;
+ }
+
+ if ((System.currentTimeMillis() - startMs) > this.receiveTimeout)
+ {
+ break;
+ }
+
+ } while (rv == -1);
+
+ if (this.active)
+ {
+ throw new EOFException("Serial port timeout on " + this.portName);
+ }
+
+ return -1;
+ }
+
+
+ protected char readChar() throws Exception
+ {
+ int rv = -1;
+
+ try
+ {
+ rv = this.communicationHandler.read();
+ }
+ catch (PlugInBaseException ex)
+ {
+ throw ex;
+ }
+
+ if (rv == -1)
+ {
+ if (this.active)
+ {
+ throw new EOFException("Serial port timeout on " + this.portName);
+ }
+
+ throw new InterruptedException();
+ }
+ return (char) rv;
+ }
+
+
+ public abstract SerialSettings getSerialSettings();
+
+
+ public String right(String s, int size)
+ {
+ if (s == null)
+ return null;
+ if (s.length() <= size)
+ {
+ return s;
+ }
+ return s.substring(s.length() - size);
+ }
+
+
+ public int unsignedByteToInt(byte b)
+ {
+ return b & 0xFF;
+ }
+
+
+ public String unsignedByteToIntAsHexString(byte data)
+ {
+ return Integer.toHexString(this.unsignedByteToInt(data));
+ }
+
+
+ protected void write(int[] buf) throws PlugInBaseException
+ {
+ this.communicationHandler.write(buf);
+ this.communicationHandler.flush();
+ }
+
+
+ protected void disconnectDevice()
+ {
+ this.communicationHandler.disconnectDevice();
+ this.active = false;
+ }
+
+
+ protected void write(byte[] buf) throws PlugInBaseException
+ {
+ this.communicationHandler.write(buf);
+ this.communicationHandler.flush();
+ }
+
+
+ protected void writeDeviceIdentification()
+ {
+ DeviceIdentification deviceIdentification = new DeviceIdentification(dataAccess.getI18nControlInstanceBase());
+ deviceIdentification.setDeviceDefinition(this.deviceDefinition);
+ deviceIdentification.device_serial_number = serialNumber;
+
+ outputWriter.setDeviceIdentification(deviceIdentification);
+ outputWriter.writeDeviceIdentification();
+ }
+
+
+ public void setGlucoseUnitType(GlucoseUnitType glucoseUnitType)
+ {
+ this.glucoseUnitType = glucoseUnitType;
+ }
+
+
+ public void writeBGData(float bg, int year, int month, int day, int hour, int minute)
+ {
+ MeterValuesEntry mve = new MeterValuesEntry();
+ mve.setBgValue(bg, glucoseUnitType);
+ mve.setDateTimeObject(getATechDate(year, month, day, hour, minute));
+
+ this.outputWriter.writeData(mve);
+ }
+
+
+ public ATechDate getATechDate(int year, int month, int day, int hour, int minute)
+ {
+ return new ATechDate(day, month, year, hour, minute, ATechDateType.DateAndTimeMin);
+ }
+
+
+ protected void read(int[] data) throws PlugInBaseException
+ {
+ communicationHandler.read(data);
+ }
+
+}
Copied: trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/UsbMeterAbstract.java (from rev 1382, trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaUsbMeterHandler.java)
===================================================================
--- trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/UsbMeterAbstract.java (rev 0)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/UsbMeterAbstract.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -0,0 +1,287 @@
+package ggc.meter.device;
+
+import java.io.EOFException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.atech.utils.data.ATechDate;
+import com.atech.utils.data.ATechDateType;
+
+import ggc.core.data.defs.GlucoseUnitType;
+import ggc.meter.data.MeterValuesEntry;
+import ggc.meter.data.defs.MeterDeviceDefinition;
+import ggc.meter.util.DataAccessMeter;
+import ggc.plugin.comm.NRSerialCommunicationHandler;
+import ggc.plugin.comm.cfg.SerialSettings;
+import ggc.plugin.comm.cfg.USBDevice;
+import ggc.plugin.data.GGCPlugInFileReaderContext;
+import ggc.plugin.data.enums.PlugInExceptionType;
+import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.DownloadSupportType;
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.device.v2.DeviceDefinition;
+import ggc.plugin.output.OutputWriter;
+
+/**
+ * This is abstract class for Usb meters, that works with new framework (MeterInterface2).
+ */
+public abstract class UsbMeterAbstract
+{
+
+ private static final Logger LOG = LoggerFactory.getLogger(SerialMeterAbstract.class);
+
+ protected DataAccessMeter dataAccess;
+ protected OutputWriter outputWriter;
+ protected NRSerialCommunicationHandler communicationHandler;
+ protected String portName;
+ protected boolean active = false;
+ protected String serialNumber;
+ protected MeterDeviceDefinition deviceDefinition;
+ protected GlucoseUnitType glucoseUnitType;
+ private int receiveTimeout;
+
+
+ public UsbMeterAbstract(DataAccessMeter dataAccess, OutputWriter outputWriter,
+ MeterDeviceDefinition deviceDefinition)
+ {
+ this.dataAccess = dataAccess;
+ this.outputWriter = outputWriter;
+ this.portName = portName;
+ this.deviceDefinition = deviceDefinition;
+ }
+
+
+ public void readData() throws PlugInBaseException
+ {
+ checkIfDevicePresentOnConfiguredPort();
+ connectDevice();
+ preInitDevice();
+ readDeviceData();
+ }
+
+
+ private void connectDevice()
+ {
+ communicationHandler = new NRSerialCommunicationHandler(portName, getSerialSettings());
+ communicationHandler.connectAndInitDevice();
+ this.active = true;
+ }
+
+
+ protected abstract void preInitDevice() throws PlugInBaseException;
+
+
+ private void checkIfDevicePresentOnConfiguredPort() throws PlugInBaseException
+ {
+ Set<String> availablePorts = NRSerialCommunicationHandler.getAvailablePorts();
+
+ boolean found = false;
+
+ for (String port : availablePorts)
+ {
+ if (port.equalsIgnoreCase(portName))
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ throw new PlugInBaseException(PlugInExceptionType.DeviceNotFoundOnConfiguredPort);
+ // if (availablePorts.size() > 0)
+ // {
+ //
+ // }
+ // else
+ // {
+ // throw new
+ // PlugInBaseException(PlugInExceptionType.DeviceNotFoundOnConfiguredPort);
+ // }
+ }
+ }
+
+
+ public abstract void readDeviceData() throws PlugInBaseException;
+
+
+ protected void setReceiveTimeout(int timeout) throws PlugInBaseException
+ {
+ this.receiveTimeout = timeout;
+ this.communicationHandler.setReceiveTimeout(timeout);
+ }
+
+
+ protected byte readByte() throws Exception
+ {
+ int rv = -1;
+ long startMs = System.currentTimeMillis();
+
+ do
+ {
+ rv = this.communicationHandler.read();
+
+ if (rv != -1)
+ {
+ return (byte) rv;
+ }
+
+ if ((System.currentTimeMillis() - startMs) > this.receiveTimeout)
+ {
+ break;
+ }
+
+ } while (rv == -1);
+
+ if (this.active)
+ {
+ throw new EOFException("Serial port timeout on " + this.portName);
+ }
+
+ return -1;
+ }
+
+
+ protected char readChar() throws Exception
+ {
+ int rv = -1;
+
+ try
+ {
+ rv = this.communicationHandler.read();
+ }
+ catch (PlugInBaseException ex)
+ {
+ throw ex;
+ }
+
+ if (rv == -1)
+ {
+ if (this.active)
+ {
+ throw new EOFException("Serial port timeout on " + this.portName);
+ }
+
+ throw new InterruptedException();
+ }
+ return (char) rv;
+ }
+
+
+ public abstract SerialSettings getSerialSettings();
+
+
+ public String right(String s, int size)
+ {
+ if (s == null)
+ return null;
+ if (s.length() <= size)
+ {
+ return s;
+ }
+ return s.substring(s.length() - size);
+ }
+
+
+ public int unsignedByteToInt(byte b)
+ {
+ return b & 0xFF;
+ }
+
+
+ public String unsignedByteToIntAsHexString(byte data)
+ {
+ return Integer.toHexString(this.unsignedByteToInt(data));
+ }
+
+
+ protected void write(int[] buf) throws PlugInBaseException
+ {
+ this.communicationHandler.write(buf);
+ this.communicationHandler.flush();
+ }
+
+
+ protected void disconnectDevice()
+ {
+ this.communicationHandler.disconnectDevice();
+ this.active = false;
+ }
+
+
+ protected void write(byte[] buf) throws PlugInBaseException
+ {
+ this.communicationHandler.write(buf);
+ this.communicationHandler.flush();
+ }
+
+
+ protected void writeDeviceIdentification()
+ {
+ DeviceIdentification deviceIdentification = new DeviceIdentification(dataAccess.getI18nControlInstanceBase());
+ deviceIdentification.setDeviceDefinition(this.deviceDefinition);
+ deviceIdentification.device_serial_number = serialNumber;
+
+ outputWriter.setDeviceIdentification(deviceIdentification);
+ outputWriter.writeDeviceIdentification();
+ }
+
+
+ public void setGlucoseUnitType(GlucoseUnitType glucoseUnitType)
+ {
+ this.glucoseUnitType = glucoseUnitType;
+ }
+
+
+ public void writeBGData(float bg, int year, int month, int day, int hour, int minute)
+ {
+ MeterValuesEntry mve = new MeterValuesEntry();
+ mve.setBgValue(bg, glucoseUnitType);
+ mve.setDateTimeObject(getATechDate(year, month, day, hour, minute));
+
+ this.outputWriter.writeData(mve);
+ }
+
+
+ public ATechDate getATechDate(int year, int month, int day, int hour, int minute)
+ {
+ return new ATechDate(day, month, year, hour, minute, ATechDateType.DateAndTimeMin);
+ }
+
+
+ protected void read(int[] data) throws PlugInBaseException
+ {
+ communicationHandler.read(data);
+ }
+
+
+ public void readConfiguration(DeviceDefinition definition, Object connectionParameters, OutputWriter outputWriter)
+ throws PlugInBaseException
+ {
+ }
+
+
+ public List<USBDevice> getAllowedDevicesList()
+ {
+ List<USBDevice> usbDeviceList = new ArrayList<USBDevice>();
+ usbDeviceList.add(new USBDevice("Contour USB", 0x1a79, 0x6002));
+ usbDeviceList.add(new USBDevice("Contour USB", 0x1a79, 0x7390)); // ?
+ usbDeviceList.add(new USBDevice("Contour Next", 0x1a79, 0x7350));
+ usbDeviceList.add(new USBDevice("Contour Next USB", 0x1a79, 0x7410));
+ usbDeviceList.add(new USBDevice("Contour Next Link", 0x1a79, 0x6300));
+ usbDeviceList.add(new USBDevice("Contour Next Link", 0x1a79, 0x6200)); // ?
+
+ return usbDeviceList;
+ }
+
+
+ public List<GGCPlugInFileReaderContext> getFileDownloadContexts(DownloadSupportType downloadSupportType)
+ {
+ return null;
+ }
+
+}
Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/abbott/OptiumXceed.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/abbott/OptiumXceed.java 2016-12-25 13:37:33 UTC (rev 1420)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/abbott/OptiumXceed.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -9,7 +9,7 @@
import com.atech.utils.data.ATechDate;
import com.atech.utils.data.TimeZoneUtil;
-import ggc.core.data.defs.DailyValuesExtendedType;
+import ggc.core.data.ExtendedDailyValueType;
import ggc.core.data.defs.GlucoseUnitType;
import ggc.meter.data.MeterValuesEntry;
import ggc.meter.device.AbstractSerialMeter;
@@ -512,7 +512,7 @@
// .format(dataAccess.getBGValueByType(DataAccessPlugInBase.BG_MGDL,
// DataAccessPlugInBase.BG_MMOL, data)));
- mve.setUrine(DailyValuesExtendedType.Urine_mmolL, dataAccess.getFormatedValue(
+ mve.setUrine(ExtendedDailyValueType.Urine_mmolL, dataAccess.getFormatedValue(
dataAccess.getBGValueByType(GlucoseUnitType.mg_dL, GlucoseUnitType.mmol_L, Float.parseFloat(data)), 1));
this.outputWriter.writeData(mve);
Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaDecoder.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaDecoder.java 2016-12-25 13:37:33 UTC (rev 1420)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/device/ascensia/impl/AscensiaDecoder.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -1,7 +1,5 @@
package ggc.meter.device.ascensia.impl;
-import java.util.ArrayList;
-import java.util.List;
import java.util.StringTokenizer;
import org.slf4j.Logger;
@@ -12,7 +10,9 @@
import com.atech.utils.data.TimeZoneUtil;
import ggc.core.data.defs.GlucoseUnitType;
+import ggc.meter.data.GlucoseMeterMarkerDto;
import ggc.meter.data.MeterValuesEntry;
+import ggc.meter.defs.GlucoseMeterMarker;
import ggc.meter.util.DataAccessMeter;
import ggc.plugin.device.DeviceIdentification;
import ggc.plugin.output.OutputWriter;
@@ -128,7 +128,8 @@
String markers = strtok.nextToken();
- mve.addParameter("MARKERS", convertMarkers(markers)); // User Marks
+ // user marks
+ convertMarkers(markers, mve); // User Marks
strtok.nextToken(); // N/A
@@ -219,54 +220,52 @@
}
- private String convertMarkers(String markersInput)
+ private void convertMarkers(String markersInput, MeterValuesEntry mve)
{
- List<String> markers = new ArrayList<String>();
-
if (markersInput.contains("<"))
{
- markers.add("MARKER_LO");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.LowGlucose));
}
else if (markersInput.contains(">"))
{
- markers.add("MARKER_HI");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.HighGlucose));
}
if (markersInput.contains("B"))
{
if (!markersInput.contains("ZB"))
- markers.add("MARKER_PRE_MEAL");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.PreMeal));
}
else if (markersInput.contains("A"))
{
if (!markersInput.contains("ZA"))
- markers.add("MARKER_POST_MEAL");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.PostMeal));
}
if (markersInput.contains("D"))
{
- markers.add("MARKER_DONT_FEEL_RIGHT");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.DontFeelRight));
}
if (markersInput.contains("I"))
{
- markers.add("MARKER_SICK");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.Sick));
}
if (markersInput.contains("S"))
{
- markers.add("MARKER_STRESS");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.Stress));
}
if (markersInput.contains("X"))
{
- markers.add("MARKER_ACTIVITY");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.Activity));
}
if (markersInput.contains("C"))
{
if (!markersInput.contains("ZC"))
- markers.add("MARKER_CONTROL_RESULT");
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.ControlResult));
}
if (markersInput.contains("Z"))
@@ -322,13 +321,9 @@
time = "3 h";
}
- markers.add(String.format(i18nControl.getMessage("MARKER_AFTER_FOOD"), time));
+ mve.addGlucoseMeterMarker(GlucoseMeterMarkerDto.createMarker(GlucoseMeterMarker.AfterFoodWithTime, time));
}
- if (markers.size() == 0)
- return null;
- else
- return DataAccessMeter.getInstance().createStringRepresentationOfCollection(markers, ",");
}
Modified: trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2016-12-25 13:37:33 UTC (rev 1420)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -482,7 +482,7 @@
// System.out.println("Load Extended Handler: " + new
// ExtendedDailyValue(this));
- this.addExtendedHandler(EXTENDED_HANDLER_DAILY_VALUE, new ExtendedDailyValueHandler(this));
+ this.addExtendedHandler(EXTENDED_HANDLER_DAILY_VALUE, new ExtendedDailyValueHandler());
// this.extended_handlers = new Hashtable<>();
// this.extended_handlers.put(EXTENDED_HANDLER_DAILY_VALUE, new
// ExtendedDailyValue(this));
Added: trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/GlucoseMeterMarkerHandler.java
===================================================================
--- trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/GlucoseMeterMarkerHandler.java (rev 0)
+++ trunk/ggc-plugins/ggc-meter/src/ggc/meter/util/GlucoseMeterMarkerHandler.java 2016-12-25 16:58:49 UTC (rev 1428)
@@ -0,0 +1,22 @@
+package ggc.meter.util;
+
+import java.util.List;
+
+import ggc.meter.defs.GlucoseMeterMarker;
+
+/**
+ * Created by andy on 12/11/16.
+ */
+public class GlucoseMeterMarkerHandler
+{
+
+ // FIXME
+ public String t(List<GlucoseMeterMarker> markers)
+ {
+ if (markers.size() == 0)
+ return null;
+ else
+ return DataAccessMeter.getInstance().createStringRepresentationOfCollection(markers, ",");
+ }
+
+}
Modified: trunk/ggc-plugins/ggc-plugins-base/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-plugins-base/pom.xml 2016-12-25 16:39:02 UTC (rev 1427)
+++ trunk/ggc-plugins/ggc-plugins-base/pom.xml 2016-12-25 16:58:49 UTC (rev 1428)
@@ -3,40 +3,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ <artifactId>ggc-plugins</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <name>GGC Plugin Base Project</name>
+ <name>GGC Plugins Base</name>
- <artifactId>ggc-plugin-base</artifactId>
+ <artifactId>ggc-plugins-base</artifactId>
<version>${ggc-plugin-base.version}</version>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
+
<dependencies>
<dependency>
<groupId>net.sf.ggc</groupId>
Modified: trunk/ggc-plugins/pom.xml
===================================================================
--- trunk/ggc-plugins/pom.xml 2016-12-25 16:39:02 UTC (rev 1427)
+++ trunk/ggc-plugins/pom.xml 2016-12-25 16:58:49 UTC (rev 1428)
@@ -13,6 +13,13 @@
<artifactId>ggc-plugins</artifactId>
<packaging>pom</packaging>
+
+ <modules>
+ <module>ggc-plugins-base</module>
+
+ </modules>
+
+
<!--
<modules>
<module>ggc-help</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 17:24:17
|
Revision: 1432
http://sourceforge.net/p/ggc/code/1432
Author: andyrozman
Date: 2016-12-25 17:24:13 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Pumps
- moved to GGC Plugins
Modified Paths:
--------------
trunk/ggc-plugins/pom.xml
Added Paths:
-----------
trunk/ggc-plugins/ggc-pump/
trunk/ggc-plugins/ggc-pump/build/build.xml
trunk/ggc-plugins/ggc-pump/docs/Changelog
trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt
trunk/ggc-plugins/ggc-pump/pom.xml
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent2.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeAlarmHandler.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeBasalHandler.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeBolusHandler.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeComponentHandler.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeComponentHandlerAbstract.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeErrorHandler.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypeEventHandler.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/PumpDataTypePenInjectionHandler.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/pdtc/TemporaryBasalRateComponent.java
Removed Paths:
-------------
trunk/ggc-plugins/ggc-pump/build/build.xml
trunk/ggc-plugins/ggc-pump/docs/Changelog
trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt
trunk/ggc-plugins/ggc-pump/pom.xml
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java
trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java
trunk/ggc-pump/
Deleted: trunk/ggc-plugins/ggc-pump/build/build.xml
===================================================================
--- trunk/ggc-pump/build/build.xml 2016-12-25 16:39:02 UTC (rev 1427)
+++ trunk/ggc-plugins/ggc-pump/build/build.xml 2016-12-25 17:24:13 UTC (rev 1432)
@@ -1,121 +0,0 @@
-<?xml version="1.0" ?>
-<project name="GNU Pump Tool" default="build" basedir=".">
- <description>
- Build file for GGC Pump
- </description>
-
- <!-- Environment properties read from a file ...-->
- <property file="../../build/AtechTools.properties"/>
- <property file="../../ggc-core/build/GGC_Core_Version.properties"/>
- <property file="../../ggc-core/build/GGCBuild.properties"/>
-<!-- <property file="./GGCPlugInBaseBuild.properties"/>
- <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/> -->
- <property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/>
- <property file="./GGCPumpToolVersion.properties"/>
-
- <!-- These should *not* be modified on the command line! -->
- <property name="build.dir" value="${outdir.dir}/classes"/>
- <property name="deploy.dir" value="${outdir.dir}/deploy"/>
-
- <property name="jar_file_name" value="ggc-pump_tool" />
- <property name="jar_file_version" value="${ggc-pump-tool.version}" />
-
-
- <!-- Build GGC -->
-
- <target name="build">
- <echo message=" ************************************************* "/>
- <echo message=" **** GGC PlugIn Base Build **** "/>
- <echo message=" ************************************************* "/>
- <echo message=""/>
- <echo message=" clean = clean build dir"/>
- <echo message=" compile = build GGC PlugIn Base"/>
- <echo message=" jar = create GGC PlugIn Base jar"/>
- <echo message=" full = compile,jar GGC PlugIn Base"/>
- <echo message=" deploy = full plus deploy in main (GGC PlugIn Base)"/>
- <echo message=""/>
- </target>
-
-
- <!-- Public targets -->
-
- <target name="clean" description="Clean build directory and previus version of GGC">
- <delete dir="${binary.dir}"/>
- <mkdir dir="${binary.dir}" />
- </target>
-
-
- <target name="copy" description="Copy all needed files">
- <mkdir dir="${binary.dir}" />
- <copy todir="${binary.dir}/" overwrite="true">
- <fileset dir="${source.dir}" casesensitive="no">
- <include name="*.properties"/>
- </fileset>
- </copy>
- <mkdir dir="${binary.dir}/icons" />
- <copy todir="${binary.dir}/icons" overwrite="true">
- <fileset dir="../src/icons" casesensitive="no">
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- </fileset>
- </copy>
- </target>
-
-
-
- <target name="compile" depends="copy" description="Build GGC">
- <mkdir dir="${deploy.dir}" />
- <javac srcdir="${source.dir}"
- destdir="${binary.dir}"
- includes="ggc/**"
- deprecation="off" debug="true">
- <classpath>
- <pathelement path="${classpath.full}" />
- <pathelement path="../../build/deploy_files/ggc-plugin_base-${ggc-plugin-base.version}.jar" />
- <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar" />
- </classpath>
- </javac>
- </target>
-
-
-<!--
- <target name="build_ggc" description="Build GGC" />
-
- includes="ggc/**"
- excludes="ggc/db/**"
-jar_file_version
-
--->
-
-
- <target name="jar" description="Create jar files" depends="compile">
- <jar jarfile="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar"
- update="false"
- index="false"
- >
-
- <fileset dir="${binary.dir}">
- <include name="**/*"/>
- </fileset>
-
- <fileset dir="${source.dir}">
- <include name="*."/>
- <include name="html/**"/>
- </fileset>
-
-
- </jar>
- </target>
-
-
- <target name="full" depends="clean, jar">
- </target>
-
-
- <target name="deploy" depends="clean, jar">
- <copy file="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar" todir="../../build/deploy_files/"/>
- </target>
-
-
-</project>
Copied: trunk/ggc-plugins/ggc-pump/build/build.xml (from rev 1431, trunk/ggc-pump/build/build.xml)
===================================================================
--- trunk/ggc-plugins/ggc-pump/build/build.xml (rev 0)
+++ trunk/ggc-plugins/ggc-pump/build/build.xml 2016-12-25 17:24:13 UTC (rev 1432)
@@ -0,0 +1,121 @@
+<?xml version="1.0" ?>
+<project name="GNU Pump Tool" default="build" basedir="">
+ <description>
+ Build file for GGC Pump
+ </description>
+
+ <!-- Environment properties read from a file ...-->
+ <property file="../../build/AtechTools.properties"/>
+ <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/>
+ <property file="../../ggc-core-app/ggc-core/build/GGCBuild.properties"/>
+<!-- <property file="./GGCPlugInBaseBuild.properties"/>
+ <property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/> -->
+ <property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/>
+ <property file="GGCPumpToolVersion.properties"/>
+
+ <!-- These should *not* be modified on the command line! -->
+ <property name="build.dir" value="${outdir.dir}/classes"/>
+ <property name="deploy.dir" value="${outdir.dir}/deploy"/>
+
+ <property name="jar_file_name" value="ggc-pump_tool" />
+ <property name="jar_file_version" value="${ggc-pump-tool.version}" />
+
+
+ <!-- Build GGC -->
+
+ <target name="build">
+ <echo message=" ************************************************* "/>
+ <echo message=" **** GGC PlugIn Base Build **** "/>
+ <echo message=" ************************************************* "/>
+ <echo message=""/>
+ <echo message=" clean = clean build dir"/>
+ <echo message=" compile = build GGC PlugIn Base"/>
+ <echo message=" jar = create GGC PlugIn Base jar"/>
+ <echo message=" full = compile,jar GGC PlugIn Base"/>
+ <echo message=" deploy = full plus deploy in main (GGC PlugIn Base)"/>
+ <echo message=""/>
+ </target>
+
+
+ <!-- Public targets -->
+
+ <target name="clean" description="Clean build directory and previus version of GGC">
+ <delete dir="${binary.dir}"/>
+ <mkdir dir="${binary.dir}" />
+ </target>
+
+
+ <target name="copy" description="Copy all needed files">
+ <mkdir dir="${binary.dir}" />
+ <copy todir="${binary.dir}/" overwrite="true">
+ <fileset dir="${source.dir}" casesensitive="no">
+ <include name="*.properties"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${binary.dir}/icons" />
+ <copy todir="${binary.dir}/icons" overwrite="true">
+ <fileset dir="../src/icons" casesensitive="no">
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+
+ <target name="compile" depends="copy" description="Build GGC">
+ <mkdir dir="${deploy.dir}" />
+ <javac srcdir="${source.dir}"
+ destdir="${binary.dir}"
+ includes="ggc/**"
+ deprecation="off" debug="true">
+ <classpath>
+ <pathelement path="${classpath.full}" />
+ <pathelement path="../../build/deploy_files/ggc-plugin_base-${ggc-plugin-base.version}.jar" />
+ <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar" />
+ </classpath>
+ </javac>
+ </target>
+
+
+<!--
+ <target name="build_ggc" description="Build GGC" />
+
+ includes="ggc/**"
+ excludes="ggc/db/**"
+jar_file_version
+
+-->
+
+
+ <target name="jar" description="Create jar files" depends="compile">
+ <jar jarfile="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar"
+ update="false"
+ index="false"
+ >
+
+ <fileset dir="${binary.dir}">
+ <include name="**/*"/>
+ </fileset>
+
+ <fileset dir="${source.dir}">
+ <include name="*."/>
+ <include name="html/**"/>
+ </fileset>
+
+
+ </jar>
+ </target>
+
+
+ <target name="full" depends="clean, jar">
+ </target>
+
+
+ <target name="deploy" depends="clean, jar">
+ <copy file="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar" todir="../../build/deploy_files/"/>
+ </target>
+
+
+</project>
Deleted: trunk/ggc-plugins/ggc-pump/docs/Changelog
===================================================================
--- trunk/ggc-pump/docs/Changelog 2016-12-25 16:39:02 UTC (rev 1427)
+++ trunk/ggc-plugins/ggc-pump/docs/Changelog 2016-12-25 17:24:13 UTC (rev 1432)
@@ -1,317 +0,0 @@
-
-Changes file for GGC Pump Tool
-==============================
-
-2.0.1 [26.5.2016] [Andy]
-- refactorings (code, db)
-- graphs for pump (the one from core), not complete yet
-- comments
-- dana refactoring
-- added code for minimed. not tested yet, disabled for now
-
-2.0.0 [11.12.2015]
-- change to PumpEventType, RatioType
-- changes to Bolus, BolusWizard, RatioDTO and TBR Dto
-- added Minimed code for Pump. Most of code is ready, we need to test this under different versions
- of Pumps (configuration) and also decoding (data) needs to be tested on several devices. But initial version is
- ready. There might be some changes later, but most of decoders/converters are ready
-- added dummy devices: tandem, asante
-
-
-1.7.1 [24.10.2015] [Andy]
- * implemented all devices as DeviceV2 (created bridges for V1 to V2)
- * ATechDateType getDateTimeFormat() refactoring
- * AChanges for device V2: AccuChekPumpHandler, AccuChekPumpReader, DanaPumpHandler, updated PumpDefinitions
- * Pump Profile adding with type Profile, ProfileSelector. We now get an error when adding Profile in case that profiles are not defined. We need additional change here, but at least we don;t get nullPointer exception.
- * added definitions, for Profile, TBR
- * added PumpDeviceInstanceWithHandler
- * refactoring PumpProfile selector to work with V2 devices (doesn't work yet, but we don't get Fatal Exception)
- * manager all devices removed from V1 context
-
-
-1.7.0 [19.10.2015] [Andy]
- * added PumpPluginDefinition for plugin defintions and refactoring of DataAccessPump
- * added PumpReportDefinition for better management of reports
- * migrating from Log to SLF4j Logger
- * PumpBasalType TBR Profile deprecated
- * refactoring BG conversion
- * Reports changes: PumpAdditionalDataHandler
-
-
-1.6.1 [10.10.2015]
- * refactoring because of DataAccess and ConfigurationManagerWrapper changes
- * added Minimed Devices to PumpDefinition
- * working on report: PumpDataDailyTimeSheet, added CGMS support, added types for different types
- of reports (Base, Base+CGMS, Base+Food, Base+CGMS+Food). Implementation is planned for
- Base (v2) and Base+CGMS for 0.7
-
-
-1.6.0 [2.10.2015] - Andy
- * changes because of Selector refactoring / fixing
- * added BasalStatistic, BasalRatesDayDTO, PumpBasalManager, PumpBolusManager
- * changed AdditionalData map (for PumpData to enum) which required some major refactorings on some classes
- * fixes to Graph, fixed now...
-
-1.5.1 [6.7.2015] - Andy
- * added experimental (just developer tested) support for Insulet OmniPod
- * added Config File download support
- * Support for OmniPod, Animas and Dexcom G4 are EXPERMINTAL (tested just with my configuration, which
- might produce date/time problems for people in other Timezones).
-
-1.5.0 [26.4.2015] - Andy
- * implementing DeviceInterfaceV2
- * added BasalType.ValueChange
- * Fixing DailyTable report to support BasalType.ValueChange
- * finalizing Animas Pump
- * fix AccuChek problem with Basals (using BasalType.ValueChange and removing all unusable BasalProcessing in code)
- * Rework Animas to use Communication Handler
- * Added global PumpValuesWriter, rework Animas to use it
- - Extended configuration interface for Pumps
- - Extended Animas implementation
- - Refactoring of AccuChek Pump Reader to use PumpBasalType.ValueChanged instead of Profiles, which are not natively supported by AC
- - Changes on Dana Pump (configuration), planned refactoring in future...
- - Added Enums to Pump, reworking most of code depending on that
- - Data handling changed
- - Data writter
- - Animas code finalized
-
-1.4.0 [4.1.2015]
- * support for Animas pump
-
-1.3.5 [21.09.2014]
- * printing reports ...
-
-1.3.4 [10.12.2012]
- * In manual editing we replaced text boxes with JSpinner on edit of BG and CH. (same was done in Pen/Injection Mode). Also we
- set limits on both. BG max value is 999 mg/dL (55.4 mmol/L) and CH cannot be negative
-
-1.3.3 [1.9.2012]
- * Added full Minimed code to SVN. This code can communicate via COM cable with pump, but is unable to read history data or
- interpret this data.
-
-1.3.2 [3.7.2011]
- * Support for Minimed is currently disabled, we need to add support for processing profiles, and also
- adding profile change adding.
-
-1.3.1 [3.6.2011]
- * Support for Minimed Carelink finalizing
-
-1.2.2 [20.6.2010]
- * PLUGIN_BASE: Required 0.5.2
-
-1.2.1 [18.6.2010]
- * PLUGIN_BASE: Required 0.5
- * Changed main Constructor for device classes
-
-1.2.0 [4.6.2010]
- * Finalizing work on Spirit pump download
- * Added support for reading files
-
-1.1.1 [23.4.2010]
- * Implemented statistics for GGC application (Pump Mode)
-
-1.0.5 [16.02.2010]
- * I18n is now partitially in PlugInBase
- * Minor device changes
- * Started work on SmartPix under Linux (we have some major problems here, I hope to get
- them fixed soon
- * PLUGIN_BASE: Required 0.4.5
-
-
-1.0.4
- * PluginBase changed
- * I18n Changed
- * Company context changed
- * Device Selector is now global and uses PlugInDeviceUtil
- * Continuning work on Roche Pumps - Profiles
-
-1.0.3 [30.10.2009]
- * Finished Dana import
- * TBR fixed
- * Minor fixes in manual data entry
- * Continuing support for Roche (still working on profiles)
-
-1.0.2 [6.8.2009]
- * Started tinkering with Dana device and BlueTooth connection
- * Plugin changed fully to v2 framework, all menus are now created directly in plugin
- * Separate class that now holds all device/company variables
-
-1.0.1 [10.7.2009]
- * required base plugin is now 0.4.1 (framework v2)
- * All basic functionalities are implemented (Download, List, About)
- * Framework implementation is v2, with some v1 elements (very few), which will be replaced soon
- * Added special functionalities: Graphs, Printing. Currently only Daily graph is available, but it's
- still under construction
- * Roche implementation is finished concerning basic functionality, only problem we currently have is
- basal patterns history. SmartPix doesn't show exact history of BP. We will try to make this work,
- but until SmartPix is extended/fixed so long code won't be 100%, which means possible losss of some
- BP history.
- * MultiWave entry and Square are finished
-
-
-0.5.1 (current)
- * Work on Accu-chek pump import
- * Fixed Events, Basals and Boluses
- * Working on download of Pump data, testing with Roche implementation
- * major changes in PumpValuesTableModel (and also on its parent)
-
-
-0.4.8 (current)
- * Added food db adding from Nutritional plugin
- * Fixed small time problem with BolusHelper
- * Started work on reading old data
-
-
-0.4.7
- * Started work on Minimed Import (from Solutions Pumps & Meter export file (MS Access *.mmp file))
- * Minor fix of Multiwave Bolus in Manual input
-
-0.4.6
- * Day Table has removed comment column, and now we have added Food column, which together with Additional data
- column uses MultiLineTooltip (MultiLineTooltipModel)
- * Import of profile and add Comment
-
-0.4.5
- * Added gcc.pump.print.* classes and implemented PrintPumpDataAbstract and PrintPumpDataBase (this all
- classes implement PrintAbstractIText)
- * Add PumpPrintDialog, which is also now in Atech-Tools (PrintDialogRange), so we just implement abstract
- methods
- * Fixed import, so now import/export fully works
-
-0.4.4
- * Printing work started.
-
-0.4.3 (6.4.2009)
- * Possibility of removal of warning screen
-
-0.4.2
- * Profile selector changes (we use name now for changing last active and last active has now correct value
- for non-active)
- * BackupRestoreCollection fixed
- * Manual adding Fixed for all Basals (edit) and Basal Profiles
-
-0.4.1 (1.4.2009)
- * Profiles editor finished
- * added Pump Profile Selector, which is tied to pump you are using (not to active profiles)
- * Configuration of Pumps enabled
- * Configuration fixed (time fix disabled)
- * Web Lister enabled
- * All pumps description available for weblister
- * About picture added
-
-0.3.3
- * Test version for Profiles done, needs some fixes though, but most of functionality planned is done for now
-
-0.3.2
- * Profile manager work started
-
-0.3.1
- * Whole reorganization of all GGC projects, so that all sub projects can now use GGC core
-
-0.2.2
- * Added Bolus Helper to Bolus entry (after redesign of GGC (GGC was split into two seperate projects, GGC Core and
- GGC Desktop))
- * Bolus Helper changed so that it produces value in float type (not in integer anymore)
-
-0.2.1
- * Version advanced after, Manual Entry finished
-
-0.1.17
- * Additional data dialogs finished
-
-0.1.16
- * Statistics finished
-
-0.1.15
- * Work started on statistics
-
-0.1.14
- * If everything is set check done
-
-0.1.13
- * Editing of additional data done
-
-0.1.12
- * Changes to main manual pump windows (editing and addding changes made back)
- * refresh data
- * Editing of additional data (except for Food entries)
-
-0.1.11
- * Editing entries (rows)
- * Reading data to PumpDataTypeComponent
- * Writing data to PumpDataTypeComponent
-
-0.1.10
- * Working with database, adding entries to database
-
-0.1.9.2
- * Adding 'Foods by Description' to dialog
- * Focusing problem - major one
-
-0.1.9.1
- * Added Food by Description, by using TransferDialog mechanism. It needs to be reworked though.
-
-0.1.8
- * After reorganization of all plugins, database stopped working, we fixed that here
-
-0.1.7
- * Manually... Db
-
-0.1.6.1 - 0.1.6.8
- * Manually adding pump data
-
-0.1.6 10-06
- * Manually adding pump data - Start
-
-0.1.5 10-02
- * Added Db interface in Pump and transfer Db Instance to plugin interface
-
-
-0.1.4 08-10
- * Pump Definitions extended (Pump Interface will change later)
- * PumpValues contexts were extended. Pump entries, need to be viewed as data for whole day, not as separate
- records, which will also be the way to compare them to old ones. Generation of day records, must be
- unified (how will be determined later)
-
-0.1.3 08-09
- * modification to PumpInterface to include Alarm and Event mappings
-
-
-2008-08-08 (0.1.2)
- * first integration into ggc
- * changes to Output classes and display classes (inspired by Roche AccuCheck Pix device)
- * moved AccuChek Pix device, creation of Accu-Chek pump devices
- * added ggc.pump.data.defs contains PumpAlarms, PumpEvents, PumpReport and PumpDataType classes (work in progres)
- * started work on reading Roche/Accu-Chek Xml file
-
-
-2008-07-10 (v0.1.1) Andy Rozman <and...@us...>
- * pump tool project started (implementation)
- * basic framework created. All pump related files created from meter tool application
- * new files created for different outputs, creation of basic structure:
-
- meter_tools
- |
- |- ggc
- |
- |-- pump
- | data
- | device
- | roche
- | gui
- | config
- | list (list)
- | output (outputing data)
- | protocol (protocol for communication)
- | test (test stuff)
- | util (util)
- |-- web (for displaying different pump (list)
-
-
- * most of base stuff is implemented (outputs for example, some base protocols, guis, configuration)
- * everything was copied from meter tools 0.2, most of stuff will need to be enchanched and changed, but
- base stuff is now here.
- * created plug in class for connection to GGC
-
-
-
Copied: trunk/ggc-plugins/ggc-pump/docs/Changelog (from rev 1431, trunk/ggc-pump/docs/Changelog)
===================================================================
--- trunk/ggc-plugins/ggc-pump/docs/Changelog (rev 0)
+++ trunk/ggc-plugins/ggc-pump/docs/Changelog 2016-12-25 17:24:13 UTC (rev 1432)
@@ -0,0 +1,324 @@
+
+Changes file for GGC Pump Tool
+==============================
+
+2.0.2 [25.12.2016] [Andy]
+- PumpDataAdditionalWizardTwo
+- PumpDataTypeComponent
+- PumpDataTypeComponent2 added new class for refactoring
+- added handlers for PDT Component 2
+
+
+2.0.1 [26.5.2016] [Andy]
+- refactorings (code, db)
+- graphs for pump (the one from core), not complete yet
+- comments
+- dana refactoring
+- added code for minimed. not tested yet, disabled for now
+
+2.0.0 [11.12.2015]
+- change to PumpEventType, RatioType
+- changes to Bolus, BolusWizard, RatioDTO and TBR Dto
+- added Minimed code for Pump. Most of code is ready, we need to test this under different versions
+ of Pumps (configuration) and also decoding (data) needs to be tested on several devices. But initial version is
+ ready. There might be some changes later, but most of decoders/converters are ready
+- added dummy devices: tandem, asante
+
+
+1.7.1 [24.10.2015] [Andy]
+ * implemented all devices as DeviceV2 (created bridges for V1 to V2)
+ * ATechDateType getDateTimeFormat() refactoring
+ * AChanges for device V2: AccuChekPumpHandler, AccuChekPumpReader, DanaPumpHandler, updated PumpDefinitions
+ * Pump Profile adding with type Profile, ProfileSelector. We now get an error when adding Profile in case that profiles are not defined. We need additional change here, but at least we don;t get nullPointer exception.
+ * added definitions, for Profile, TBR
+ * added PumpDeviceInstanceWithHandler
+ * refactoring PumpProfile selector to work with V2 devices (doesn't work yet, but we don't get Fatal Exception)
+ * manager all devices removed from V1 context
+
+
+1.7.0 [19.10.2015] [Andy]
+ * added PumpPluginDefinition for plugin defintions and refactoring of DataAccessPump
+ * added PumpReportDefinition for better management of reports
+ * migrating from Log to SLF4j Logger
+ * PumpBasalType TBR Profile deprecated
+ * refactoring BG conversion
+ * Reports changes: PumpAdditionalDataHandler
+
+
+1.6.1 [10.10.2015]
+ * refactoring because of DataAccess and ConfigurationManagerWrapper changes
+ * added Minimed Devices to PumpDefinition
+ * working on report: PumpDataDailyTimeSheet, added CGMS support, added types for different types
+ of reports (Base, Base+CGMS, Base+Food, Base+CGMS+Food). Implementation is planned for
+ Base (v2) and Base+CGMS for 0.7
+
+
+1.6.0 [2.10.2015] - Andy
+ * changes because of Selector refactoring / fixing
+ * added BasalStatistic, BasalRatesDayDTO, PumpBasalManager, PumpBolusManager
+ * changed AdditionalData map (for PumpData to enum) which required some major refactorings on some classes
+ * fixes to Graph, fixed now...
+
+1.5.1 [6.7.2015] - Andy
+ * added experimental (just developer tested) support for Insulet OmniPod
+ * added Config File download support
+ * Support for OmniPod, Animas and Dexcom G4 are EXPERMINTAL (tested just with my configuration, which
+ might produce date/time problems for people in other Timezones).
+
+1.5.0 [26.4.2015] - Andy
+ * implementing DeviceInterfaceV2
+ * added BasalType.ValueChange
+ * Fixing DailyTable report to support BasalType.ValueChange
+ * finalizing Animas Pump
+ * fix AccuChek problem with Basals (using BasalType.ValueChange and removing all unusable BasalProcessing in code)
+ * Rework Animas to use Communication Handler
+ * Added global PumpValuesWriter, rework Animas to use it
+ - Extended configuration interface for Pumps
+ - Extended Animas implementation
+ - Refactoring of AccuChek Pump Reader to use PumpBasalType.ValueChanged instead of Profiles, which are not natively supported by AC
+ - Changes on Dana Pump (configuration), planned refactoring in future...
+ - Added Enums to Pump, reworking most of code depending on that
+ - Data handling changed
+ - Data writter
+ - Animas code finalized
+
+1.4.0 [4.1.2015]
+ * support for Animas pump
+
+1.3.5 [21.09.2014]
+ * printing reports ...
+
+1.3.4 [10.12.2012]
+ * In manual editing we replaced text boxes with JSpinner on edit of BG and CH. (same was done in Pen/Injection Mode). Also we
+ set limits on both. BG max value is 999 mg/dL (55.4 mmol/L) and CH cannot be negative
+
+1.3.3 [1.9.2012]
+ * Added full Minimed code to SVN. This code can communicate via COM cable with pump, but is unable to read history data or
+ interpret this data.
+
+1.3.2 [3.7.2011]
+ * Support for Minimed is currently disabled, we need to add support for processing profiles, and also
+ adding profile change adding.
+
+1.3.1 [3.6.2011]
+ * Support for Minimed Carelink finalizing
+
+1.2.2 [20.6.2010]
+ * PLUGIN_BASE: Required 0.5.2
+
+1.2.1 [18.6.2010]
+ * PLUGIN_BASE: Required 0.5
+ * Changed main Constructor for device classes
+
+1.2.0 [4.6.2010]
+ * Finalizing work on Spirit pump download
+ * Added support for reading files
+
+1.1.1 [23.4.2010]
+ * Implemented statistics for GGC application (Pump Mode)
+
+1.0.5 [16.02.2010]
+ * I18n is now partitially in PlugInBase
+ * Minor device changes
+ * Started work on SmartPix under Linux (we have some major problems here, I hope to get
+ them fixed soon
+ * PLUGIN_BASE: Required 0.4.5
+
+
+1.0.4
+ * PluginBase changed
+ * I18n Changed
+ * Company context changed
+ * Device Selector is now global and uses PlugInDeviceUtil
+ * Continuning work on Roche Pumps - Profiles
+
+1.0.3 [30.10.2009]
+ * Finished Dana import
+ * TBR fixed
+ * Minor fixes in manual data entry
+ * Continuing support for Roche (still working on profiles)
+
+1.0.2 [6.8.2009]
+ * Started tinkering with Dana device and BlueTooth connection
+ * Plugin changed fully to v2 framework, all menus are now created directly in plugin
+ * Separate class that now holds all device/company variables
+
+1.0.1 [10.7.2009]
+ * required base plugin is now 0.4.1 (framework v2)
+ * All basic functionalities are implemented (Download, List, About)
+ * Framework implementation is v2, with some v1 elements (very few), which will be replaced soon
+ * Added special functionalities: Graphs, Printing. Currently only Daily graph is available, but it's
+ still under construction
+ * Roche implementation is finished concerning basic functionality, only problem we currently have is
+ basal patterns history. SmartPix doesn't show exact history of BP. We will try to make this work,
+ but until SmartPix is extended/fixed so long code won't be 100%, which means possible losss of some
+ BP history.
+ * MultiWave entry and Square are finished
+
+
+0.5.1 (current)
+ * Work on Accu-chek pump import
+ * Fixed Events, Basals and Boluses
+ * Working on download of Pump data, testing with Roche implementation
+ * major changes in PumpValuesTableModel (and also on its parent)
+
+
+0.4.8 (current)
+ * Added food db adding from Nutritional plugin
+ * Fixed small time problem with BolusHelper
+ * Started work on reading old data
+
+
+0.4.7
+ * Started work on Minimed Import (from Solutions Pumps & Meter export file (MS Access *.mmp file))
+ * Minor fix of Multiwave Bolus in Manual input
+
+0.4.6
+ * Day Table has removed comment column, and now we have added Food column, which together with Additional data
+ column uses MultiLineTooltip (MultiLineTooltipModel)
+ * Import of profile and add Comment
+
+0.4.5
+ * Added gcc.pump.print.* classes and implemented PrintPumpDataAbstract and PrintPumpDataBase (this all
+ classes implement PrintAbstractIText)
+ * Add PumpPrintDialog, which is also now in Atech-Tools (PrintDialogRange), so we just implement abstract
+ methods
+ * Fixed import, so now import/export fully works
+
+0.4.4
+ * Printing work started.
+
+0.4.3 (6.4.2009)
+ * Possibility of removal of warning screen
+
+0.4.2
+ * Profile selector changes (we use name now for changing last active and last active has now correct value
+ for non-active)
+ * BackupRestoreCollection fixed
+ * Manual adding Fixed for all Basals (edit) and Basal Profiles
+
+0.4.1 (1.4.2009)
+ * Profiles editor finished
+ * added Pump Profile Selector, which is tied to pump you are using (not to active profiles)
+ * Configuration of Pumps enabled
+ * Configuration fixed (time fix disabled)
+ * Web Lister enabled
+ * All pumps description available for weblister
+ * About picture added
+
+0.3.3
+ * Test version for Profiles done, needs some fixes though, but most of functionality planned is done for now
+
+0.3.2
+ * Profile manager work started
+
+0.3.1
+ * Whole reorganization of all GGC projects, so that all sub projects can now use GGC core
+
+0.2.2
+ * Added Bolus Helper to Bolus entry (after redesign of GGC (GGC was split into two seperate projects, GGC Core and
+ GGC Desktop))
+ * Bolus Helper changed so that it produces value in float type (not in integer anymore)
+
+0.2.1
+ * Version advanced after, Manual Entry finished
+
+0.1.17
+ * Additional data dialogs finished
+
+0.1.16
+ * Statistics finished
+
+0.1.15
+ * Work started on statistics
+
+0.1.14
+ * If everything is set check done
+
+0.1.13
+ * Editing of additional data done
+
+0.1.12
+ * Changes to main manual pump windows (editing and addding changes made back)
+ * refresh data
+ * Editing of additional data (except for Food entries)
+
+0.1.11
+ * Editing entries (rows)
+ * Reading data to PumpDataTypeComponent
+ * Writing data to PumpDataTypeComponent
+
+0.1.10
+ * Working with database, adding entries to database
+
+0.1.9.2
+ * Adding 'Foods by Description' to dialog
+ * Focusing problem - major one
+
+0.1.9.1
+ * Added Food by Description, by using TransferDialog mechanism. It needs to be reworked though.
+
+0.1.8
+ * After reorganization of all plugins, database stopped working, we fixed that here
+
+0.1.7
+ * Manually... Db
+
+0.1.6.1 - 0.1.6.8
+ * Manually adding pump data
+
+0.1.6 10-06
+ * Manually adding pump data - Start
+
+0.1.5 10-02
+ * Added Db interface in Pump and transfer Db Instance to plugin interface
+
+
+0.1.4 08-10
+ * Pump Definitions extended (Pump Interface will change later)
+ * PumpValues contexts were extended. Pump entries, need to be viewed as data for whole day, not as separate
+ records, which will also be the way to compare them to old ones. Generation of day records, must be
+ unified (how will be determined later)
+
+0.1.3 08-09
+ * modification to PumpInterface to include Alarm and Event mappings
+
+
+2008-08-08 (0.1.2)
+ * first integration into ggc
+ * changes to Output classes and display classes (inspired by Roche AccuCheck Pix device)
+ * moved AccuChek Pix device, creation of Accu-Chek pump devices
+ * added ggc.pump.data.defs contains PumpAlarms, PumpEvents, PumpReport and PumpDataType classes (work in progres)
+ * started work on reading Roche/Accu-Chek Xml file
+
+
+2008-07-10 (v0.1.1) Andy Rozman <and...@us...>
+ * pump tool project started (implementation)
+ * basic framework created. All pump related files created from meter tool application
+ * new files created for different outputs, creation of basic structure:
+
+ meter_tools
+ |
+ |- ggc
+ |
+ |-- pump
+ | data
+ | device
+ | roche
+ | gui
+ | config
+ | list (list)
+ | output (outputing data)
+ | protocol (protocol for communication)
+ | test (test stuff)
+ | util (util)
+ |-- web (for displaying different pump (list)
+
+
+ * most of base stuff is implemented (outputs for example, some base protocols, guis, configuration)
+ * everything was copied from meter tools 0.2, most of stuff will need to be enchanched and changed, but
+ base stuff is now here.
+ * created plug in class for connection to GGC
+
+
+
Deleted: trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt
===================================================================
--- trunk/ggc-pump/docs/TO-DO_PumpTool.txt 2016-12-25 16:39:02 UTC (rev 1427)
+++ trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt 2016-12-25 17:24:13 UTC (rev 1432)
@@ -1,81 +0,0 @@
-TO-DO LIST
-==========
-
-Development of Pump Tools runs totally independent on GGC project
-==================================================================
-
-
-
- * Graphs (0.6)
-
- * Specific pump models import implementations:
- o MiniMed (2015) - protocol not public (use minimed's web tool)
- o Omni Pod (?) - Couldn't send mail... Problem with web ??
- o T:Slim (?)
-
-
-
-
-
-
-Detailed functionalities not done (and need to be):
-===================================================
-
- * Profile Editor:
- * Graphical display of Basal Pattern
- * Calculate and do warning if Basal pattern missing
-
- * Statistics
- * We currently don't support statistics for Basal, if profile selected
-
-
-
-
-
-===============================================================================
-DONE
-
- * Output types:
- o Console and file output (0.5)
- o GGC Db Output (for manual import) (0.5)
- o GGC Output (GUI integration) (0.5)
- * Communication framework for pumps (interface that all pumps will use) (later)
- * Base framework for pumps (0.3)
- * Profile Editor:
- - Base stuff
- * Manual adding of pump data (data that will in future be read from pump) (0.5)
- * Adding of additional data (bg measurements, OH intake, Activity...) (0.5)
- * List of pumps (most of them not all) (0.4)
- * Configuration and graphical interface for integration into GGC (0.5)
-
- * Profile Editor:
- - Import from some other Profile (data values)
-
- * Printing of reports:
- - Base report (no foods)
- - Extended report (foods too)
-
- * Specific pump models import implementations:
- o Sooil Dana (2011)
- o Roche/Disetronic (2011) - got all info
- o Smith's Cosmo (?) - Pump is not manufactured anymore, so it won't be supported
- o Animas (2014)
-
-
-
-===============================================================================
-
-
-
-
-
---------------------------------------------
-
-
-Help
-----
-
-pages.GGC_Pump_Add_Parameter_Wizard1
-
-
-
Copied: trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt (from rev 1431, trunk/ggc-pump/docs/TO-DO_PumpTool.txt)
===================================================================
--- trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt (rev 0)
+++ trunk/ggc-plugins/ggc-pump/docs/TO-DO_PumpTool.txt 2016-12-25 17:24:13 UTC (rev 1432)
@@ -0,0 +1,81 @@
+TO-DO LIST
+==========
+
+Development of Pump Tools runs totally independent on GGC project
+==================================================================
+
+ * Refactoring: PumpDataTypeComponent
+
+ * Graphs (0.6)
+
+ * Specific pump models import implementations:
+ o MiniMed (2015) - protocol not public (use minimed's web tool)
+ o Omni Pod (?) - Couldn't send mail... Problem with web ??
+ o T:Slim (?)
+
+
+
+
+
+
+Detailed functionalities not done (and need to be):
+===================================================
+
+ * Profile Editor:
+ * Graphical display of Basal Pattern
+ * Calculate and do warning if Basal pattern missing
+
+ * Statistics
+ * We currently don't support statistics for Basal, if profile selected
+
+
+
+
+
+===============================================================================
+DONE
+
+ * Output types:
+ o Console and file output (0.5)
+ o GGC Db Output (for manual import) (0.5)
+ o GGC Output (GUI integration) (0.5)
+ * Communication framework for pumps (interface that all pumps will use) (later)
+ * Base framework for pumps (0.3)
+ * Profile Editor:
+ - Base stuff
+ * Manual adding of pump data (data that will in future be read from pump) (0.5)
+ * Adding of additional data (bg measurements, OH intake, Activity...) (0.5)
+ * List of pumps (most of them not all) (0.4)
+ * Configuration and graphical interface for integration into GGC (0.5)
+
+ * Profile Editor:
+ - Import from some other Profile (data values)
+
+ * Printing of reports:
+ - Base report (no foods)
+ - Extended report (foods too)
+
+ * Specific pump models import implementations:
+ o Sooil Dana (2011)
+ o Roche/Disetronic (2011) - got all info
+ o Smith's Cosmo (?) - Pump is not manufactured anymore, so it won't be supported
+ o Animas (2014)
+
+
+
+===============================================================================
+
+
+
+
+
+--------------------------------------------
+
+
+Help
+----
+
+pages.GGC_Pump_Add_Parameter_Wizard1
+
+
+
Deleted: trunk/ggc-plugins/ggc-pump/pom.xml
===================================================================
--- trunk/ggc-pump/pom.xml 2016-12-25 16:39:02 UTC (rev 1427)
+++ trunk/ggc-plugins/ggc-pump/pom.xml 2016-12-25 17:24:13 UTC (rev 1432)
@@ -1,93 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
- </parent>
-
- <name>GGC Pump Tool Project</name>
-
- <artifactId>ggc-pump-tool</artifactId>
- <version>${ggc-pump-tool.version}</version>
-
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>com.ibm.old.comapi</groupId>
- <artifactId>ibm-compapi</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
-
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.4-702.jdbc3</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
-
- </dependencies>
-
- <properties>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- </properties>
-</project>
Copied: trunk/ggc-plugins/ggc-pump/pom.xml (from rev 1431, trunk/ggc-pump/pom.xml)
===================================================================
--- trunk/ggc-plugins/ggc-pump/pom.xml (rev 0)
+++ trunk/ggc-plugins/ggc-pump/pom.xml 2016-12-25 17:24:13 UTC (rev 1432)
@@ -0,0 +1,92 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-plugins</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>GGC Plugins - Pump Tool</name>
+ <artifactId>ggc-pump-tool</artifactId>
+ <version>${ggc-pump-tool.version}</version>
+
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src</sourceDirectory>
+ <scriptSourceDirectory>src</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-plugin-base</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.atech-software</groupId>
+ <artifactId>atech-tools</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.ibm.old.comapi</groupId>
+ <artifactId>ibm-compapi</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-702.jdbc3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+
+ </dependencies>
+
+ <properties>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ </properties>
+</project>
Deleted: trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java 2016-12-25 16:39:02 UTC (rev 1427)
+++ trunk/ggc-plugins/ggc-pump/src/ggc/pump/gui/manual/PumpDataAdditionalWizardTwo.java 2016-12-25 17:24:13 UTC (rev 1432)
@@ -1,965 +0,0 @@
-package ggc.pump.gui.manual;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.lang.reflect.Constructor;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import com.atech.graphics.components.JDecimalTextField;
-import com.atech.graphics.dialogs.TransferDialog;
-import com.atech.help.HelpCapable;
-import com.atech.i18n.I18nControlAbstract;
-import com.atech.plugin.PlugInClient;
-import com.atech.utils.ATSwingUtils;
-
-import ggc.core.data.Converter_mgdL_mmolL;
-import ggc.core.data.defs.GlucoseUnitType;
-import ggc.core.plugins.GGCPluginType;
-import ggc.core.plugins.NutriPlugIn;
-import ggc.core.util.DataAccess;
-import ggc.pump.data.PumpValuesEntryExt;
-import ggc.pump.data.defs.PumpAdditionalDataType;
-import ggc.pump.util.DataAccessPump;
-import ggc.shared.fooddesc.FoodDescriptionDialog;
-
-/**
- * Application: GGC - GNU Gluco Control
- * Plug-in: Pump Tool (support for Pump devices)
- *
- * See AUTHORS for copyright information.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Filename: PumpDataAdditionalWizardTwo
- * Description: Wizard for adding Additional data (step 2)
- *
- * Author: Andy {an...@at...}
- */
-
-// fix this
-
-public class PumpDataAdditionalWizardTwo extends JDialog
- implements ActionListener, HelpCapable, KeyListener, ChangeListener
-{
-
- private static final long serialVersionUID = 6600123145384610341L;
-
- private DataAccessPump m_da = DataAccessPump.getInstance();
- private I18nControlAbstract m_ic = m_da.getI18nControlInstance();
- JLabel label_title = new JLabel();
-
- boolean debug = true;
- JButton help_button = null;
- JPanel main_panel = null;
- private Container m_parent = null;
-
- JLabel label_1;
- JTextField text_1;
- JDecimalTextField num_1, num_2;
- JSpinner spin_1, spin_2;
- JCheckBox cb_1;
- JButton button_1;
- int width;
-
- PumpAdditionalDataType pumpAdditionalDataType;
-
- boolean was_action = false;
- PumpValuesEntryExt pump_objects_ext[];
-
- PumpValuesEntryExt data_object;
- PumpValuesEntryExt data_object2;
- private String internal_data[] = null;
- float food_ch;
-
-
- // new data
- /**
- * Constructor
- *
- * @param wiz_one
- * @param type
- */
- public PumpDataAdditionalWizardTwo(PumpDataAdditionalWizardOne wiz_one, String type)
- {
- super(wiz_one, "", true);
-
- // this.m_pump_add = pump_add;
-
- // this.old_data = data;
- m_parent = wiz_one;
- this.pumpAdditionalDataType = pumpAdditionalDataType.getByDescription(type);
-
- ATSwingUtils.initLibrary();
-
- init();
- }
-
-
- /**
- * Constructor
- *
- * @param dialog
- * @param pc
- */
- public PumpDataAdditionalWizardTwo(JDialog dialog, PumpValuesEntryExt pc)
- {
- super(dialog, "", true);
-
- // FIXME
- // this.m_pump_add = dataAccess.getAdditionalTypes();
-
- // this.old_data = data;
- m_parent = dialog;
- this.pumpAdditionalDataType = pc.getTypeEnum();
-
- ATSwingUtils.initLibrary();
-
- init();
-
- data_object = pc;
-
- loadObject();
- }
-
-
- /**
- * Constructor
- *
- * @param dialog
- * @param pc
- * @param pc2
- */
- public PumpDataAdditionalWizardTwo(JDialog dialog, PumpValuesEntryExt pc, PumpValuesEntryExt pc2)
- {
- super(dialog, "", true);
-
- // FIXME
- // this.m_pump_add = dataAccess.getAdditionalTypes();
-
- // this.old_data = data;
- m_parent = dialog;
- this.pumpAdditionalDataType = pc.getTypeEnum();
-
- ATSwingUtils.initLibrary();
-
- this.data_object = pc;
- this.data_object2 = pc2;
-
- init();
-
- loadObject();
- }
-
- String food_data = null;
-
-
- // for edit
- private void loadObject()
- {
- if (this.pumpAdditionalDataType == PumpAdditionalDataType.Activity || //
- this.pumpAdditionalDataType == PumpAdditionalDataType.Comment || //
- this.pumpAdditionalDataType == PumpAdditionalDataType.Urine)
- {
- this.text_1.setText(this.data_object.getValue());
- // po.setValue(this.text_1.getText());
- }
- else if (this.pumpAdditionalDataType == PumpAdditionalDataType.BloodGlucose)
- {
- // this.num_1.setValue(new Float(this.data_object.getValue()));
- // this.focusProcess(num_1);
- // po.setValue(this.num_1.getValue().toString());
- this.spin_1.setValue(new Float(this.data_object.getValue()));
- }
- else if (this.pumpAdditionalDataType == PumpAdditionalDataType.Carbohydrates)
- {
-
- this.spin_1.setValue(new Float(this.data_object.getValue()));
- // this.num_1.setValue(new Float(this.data_object.getValue()));
- // po.setValue(this.num_1.getValue().toString());
- }
- else if (this.pumpAdditionalDataType == PumpAdditionalDataType.FoodDescription)
- {
- food_data = this.data_object.getValue();
-
- if (this.data_object2 != null)
- {
- food_ch = m_da.getFloatValueFromString(this.data_object2.getValue());
- if (food_ch > 0)
- {
- this.cb_1.setSelected(true);
- }
- }
- else
- {
- food_ch = 0.0f;
- }
-
- this.num_1.setText(DataAccess.getFloatAsString(food_ch, 2));
-
- }
- else if (this.pumpAdditionalDataType == PumpAdditionalDataType.FoodDb)
- {
- food_data = this.data_object.getValue();
-
- if (this.data_object2 != null)
- {
- food_ch = m_da.getFloatValueFromString(this.data_object2.getValue());
-
- if (food_ch > 0)
- {
- this.cb_1.setSelected(true);
- }
- }
- else
- {
- food_ch = 0.0f;
- this.num_1.setText("" + food_ch);
- }
-
- this.num_1.setText(DataAccess.getFloatAsString(food_ch, 2));
-
- }
- else
- {
- System.out.println("Load for this type is not implemented !!!");
- }
-
- }
-
- int startx = 0;
-
-
- private void init()
- {
- ATSwingUtils.initLibrary();
-
- width = 380;
- int height = 310;
-
- this.setSize(width, height);
-
- m_da.addComponent(this);
- ATSwingUtils.centerJDialog(this, this.m_parent);
-
- JPanel panel = new JPanel();
- panel.setBounds(0, 0, width, height);
- panel.setLayout(null);
-
- startx = 60;
-
- main_panel = panel;
-
- this.getContentPane().add(panel);
-
- label_title = ATSwingUtils.getTitleLabel(m_ic.getMessage("ADD_PARAMETER2"), 0, 35, width, 35, panel,
- ATSwingUtils.FONT_BIG_BOLD);
-
- setTitle(m_ic.getMessage("ADD_PARAMETER2"));
-
- String button_command[] = { "cancel", m_ic.getMessage("CANCEL"), "ok", m_ic.getMessage("OK"),
- // "help", m_ic.getMessage("HELP")
- };
-
- // button
- String button_icon[] = { "cancel.png", "ok.png" };
- // null, "ok.png", "cancel.png" };
-
- int button_coord[] = { startx, 230, 120, 1, startx + 130, 230, 130, 1,
- // 170, 190, 140, 1,
- // 30, 620, 110, 1,
- // 145, 620, 110, 1,
- // 250, 390, 80, 0
- };
-
- JButton button;
- // int j=0;
- for (int i = 0, j = 0, k = 0; i < button_coord.length; i += 4, j += 2, k++)
- {
- button = new JButton(" " + button_command[j + 1]);
- button.setActionCommand(button_command[j]);
- // button.setFont(dataAccess.getFont(DataAccess.FONT_NORMAL));
- button.addActionListener(this);
-
- if (button_icon[k] != null)
- {
- button.setIcon(ATSwingUtils.getImageIcon_22x22(button_icon[k], this, m_da));
- }
-
- if (button_coord[i + 3] == 0)
- {
- button.setEnabled(false);
- }
-
- if (k <= 1)
- {
- ATSwingUtils.addComponent(button, button_coord[i], button_coord[i + 1], button_coord[i + 2], 23, panel);
- }
- else
- {
- ATSwingUtils.addComponent(button, button_coord[i], button_coord[i + 1], button_coord[i + 2], 25, panel);
- }
- }
-
- help_button = ATSwingUtils.createHelpButtonByBounds(startx + 140, 195, 120, 25, this, ATSwingUtils.FONT_NORMAL,
- m_da);
- panel.add(help_button);
-
- m_da.enableHelp(this);
-
- initType();
-
- }
-
-
- private void initType()
- {
- switch (this.pumpAdditionalDataType)
- {
- case Activity:
- case Comment:
- case Urine:
- {
- areaText();
- }
- break;
-
- case BloodGlucose:
- {
- areaBG();
- }
- break;
-
- case Carbohydrates:
- {
- areaCH();
- }
- break;
-
- case FoodDb:
- case FoodDescription:
- {
- areaFood();
- }
- break;
-
- default:
- {
- areaUnsupported();
- }
- break;
- }
- }
-
-
- // activity, comment, urine
- private void areaText()
- {
- this.label_1 = ATSwingUtils.getLabel(null, startx, 100, 110, 25, this.main_panel);
- this.text_1 = ATSwingUtils.getTextField("", startx, 130, 260, 25, this.main_panel);
-
- if (this.pumpAdditionalDataType == PumpAdditionalDataType.Activity)
- {
- this.label_1.setText(m_ic.getMessage("ACTIVITY"));
- }
- else if (this.pumpAdditionalDataType == PumpAdditionalDataType.Comment)
- {
- this.label_1.setText(m_ic.getMessage("COMMENT"));
- }
- else if (this.pumpAdditionalDataType == PumpAdditionalDataType.Urine)
- {
- this.label_1.setText(m_ic.getMessage("URINE"));
- }
-
- }
-
-
- /**
- * Area: BG
- */
- public void areaBG()
- {
-
- ATSwingUtils.getLabel(m_ic.getMessage("BLOOD_GLUCOSE") + ":", startx + 20, 108, 100, 25, main_panel);
- ATSwingUtils.getLabel("mg/dL", startx + 130, 108, 100, 25, main_panel);
- ATSwingUtils.getLabel("mmol/L", startx + 130, 138, 100, 25, main_panel);
-
- /*
- * this.num_1 = ATSwingUtils.getNumericTextField(2, 0, new Integer(0),
- * startx + 180, 108, 55, 25, this.main_panel);
- * this.num_2 = ATSwingUtils.getNumericTextField(2, 1, new Float(0.0f),
- * startx + 180, 138, 55, 25, this.main_panel);
- * this.num_1.addFocusListener(this);
- * this.num_1.addKeyListener(this);
- * this.num_2.addFocusListener(this);
- * this.num_2.addKeyListener(this);
- */
-
- this.spin_1 = ATSwingUtils.getJSpinner(0.0f, 0.0f, 999.0f, 1.0f, startx + 180, 108, 55, 25, this.main_panel);
- this.spin_1.addChangeListener(this);
-
- this.spin_2 = ATSwingUtils.getJSpinner(0.0f, 0.0f, 55.4f, 0.1f, startx + 180, 138, 55, 25, this.main_panel);
- this.spin_2.addChangeListener(this);
-
- }
-
-
- /**
- * Area: CH
- */
- public void areaCH()
- {
-
- ATSwingUtils.getLabel(m_ic.getMessage("CH_LONG") + ":", startx + 20, 108, 100, 25, main_panel);
-
- // this.num_1 = ATSwingUtils.getNumericTextField(2, 0, new Integer(0),
- // startx + 180, 108, 55, 25, this.main_panel);
-
- this.spin_1 = ATSwingUtils.getJSpinner(0.0f, 0.0f, 250.0f, 1, startx + 180, 108, ...
[truncated message content] |
|
From: <and...@us...> - 2016-12-25 17:56:01
|
Revision: 1436
http://sourceforge.net/p/ggc/code/1436
Author: andyrozman
Date: 2016-12-25 17:55:57 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Desktop
- create project
Modified Paths:
--------------
trunk/ggc-desktop/build/build.xml
trunk/ggc-desktop/doc/GGC_Supported_Hardware.html
trunk/ggc-desktop/doc/HardwareLibraries.txt
trunk/ggc-desktop/doc/TO-DO Detailed.txt
trunk/ggc-desktop/doc/TO-DO.txt
trunk/ggc-desktop/doc/TO-DO_Hardware.txt
trunk/ggc-desktop/doc/database_info.txt
trunk/ggc-desktop/pom.xml
Added Paths:
-----------
trunk/ggc-desktop/data/DbTool_Config.properties_default
trunk/ggc-desktop/data/lang/DbTool_Languages.properties
trunk/ggc-desktop/doc/archive/
trunk/ggc-desktop/doc/archive/Changelog_old
trunk/ggc-desktop/doc/archive/How_Can_I_Help_v1.txt
trunk/ggc-desktop/doc/archive/How_Can_I_Help_v2.txt
trunk/ggc-desktop/doc/archive/README_1st
trunk/ggc-desktop/doc/archive/README_1st.de
trunk/ggc-desktop/doc/archive/README_1st.si
trunk/ggc-desktop/doc/archive/TO-DO_Archive.txt
trunk/ggc-desktop/doc/usb/
trunk/ggc-desktop/doc/usb/USB-How-To.txt
trunk/ggc-desktop/doc/usb/USB-How-To_de.txt
trunk/ggc-desktop/doc/usb/USB-How-To_si.txt
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/StartupConfig.properties
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/icons/
trunk/ggc-desktop-app/ggc-desktop/src/main/resources/log4j.properties
Removed Paths:
-------------
trunk/ggc-desktop/doc/Changelog_old
trunk/ggc-desktop/doc/README_1st
trunk/ggc-desktop/doc/README_1st.de
trunk/ggc-desktop/doc/README_1st.si
trunk/ggc-desktop/doc/USB-How-To.txt
trunk/ggc-desktop/doc/USB-How-To_de.txt
trunk/ggc-desktop/doc/USB-How-To_si.txt
trunk/ggc-desktop/doc/old_docs/
trunk/ggc-desktop/src/StartupConfig.properties
trunk/ggc-desktop/src/ggc/
trunk/ggc-desktop/src/icons/
trunk/ggc-desktop/src/log4j.properties
Modified: trunk/ggc-desktop/build/build.xml
===================================================================
--- trunk/ggc-desktop/build/build.xml 2016-12-25 17:53:59 UTC (rev 1435)
+++ trunk/ggc-desktop/build/build.xml 2016-12-25 17:55:57 UTC (rev 1436)
@@ -6,9 +6,9 @@
<!-- Environment properties read from a file ...-->
<property file="../../build/AtechTools.properties"/>
- <property file="../../ggc-core/build/GGCBuild.properties"/>
+ <property file="../../ggc-core-app/ggc-core/build/GGCBuild.properties"/>
<property file="./GGC_Desktop_Version.properties"/>
- <property file="../../ggc-core/build/GGC_Core_Version.properties"/>
+ <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/>
<!-- These should *not* be modified on the command line! -->
@@ -58,7 +58,7 @@
</copy>
<mkdir dir="${build.dir}/icons" />
<copy todir="${build.dir}/icons" overwrite="true">
- <fileset dir="${source.dir}/icons" casesensitive="no">
+ <fileset dir="../../ggc-desktop-app/ggc-desktop/src/main/resources/icons" casesensitive="no">
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
<include name="**/*.png"/>
Copied: trunk/ggc-desktop/data/DbTool_Config.properties_default (from rev 1392, trunk/ggc-desktop/data/GGC_Config.properties_default)
===================================================================
--- trunk/ggc-desktop/data/DbTool_Config.properties_default (rev 0)
+++ trunk/ggc-desktop/data/DbTool_Config.properties_default 2016-12-25 17:55:57 UTC (rev 1436)
@@ -0,0 +1,88 @@
+#
+# GGC_Config (Settings for GGC)
+#31.7.2010 13:11:37
+#
+# Don't edit by hand
+# Only settings need for application startup are written here. All other info
+# is stored in database
+#
+
+#
+# Databases settings
+#
+
+#
+# Database #0 - Internal Db (H2)
+#
+DB0_CONN_NAME=Internal Db (H2)
+DB0_DB_NAME=H2 SQL
+DB0_CONN_DRIVER_CLASS=org.h2.Driver
+DB0_CONN_URL=jdbc:h2:../data/db/ggc_db
+DB0_CONN_USERNAME=sa
+DB0_CONN_PASSWORD=
+DB0_HIBERNATE_DIALECT=org.hibernate.dialect.H2Dialect
+
+#
+# Database #1 - PostgreSQL Database (v7)
+#
+DB1_CONN_NAME=PostgreSQL Database (v7)
+DB1_DB_NAME=PostgreSQL
+DB1_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB1_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v7?user=ggc&password=ggc
+DB1_CONN_USERNAME=ggc
+DB1_CONN_PASSWORD=ggc
+DB1_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #2 - PostgreSQL Database (v3)
+#
+DB2_CONN_NAME=PostgreSQL Database (v3)
+DB2_DB_NAME=PostgreSQL
+DB2_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB2_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v3?user=ggc&password=ggc
+DB2_CONN_USERNAME=ggc
+DB2_CONN_PASSWORD=ggc
+DB2_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #3 - PostgreSQL Database (ggc_test2)
+#
+DB3_CONN_NAME=PostgreSQL Database (ggc_test2)
+DB3_DB_NAME=PostgreSQL
+DB3_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB3_CONN_URL=jdbc:postgresql://localhost:5432/ggc_test2?user=ggc&password=ggc
+DB3_CONN_USERNAME=ggc
+DB3_CONN_PASSWORD=ggc
+DB3_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #4 - Internal Database
+#
+DB4_CONN_NAME=Internal Database
+DB4_DB_NAME=HypersonicSQL File
+DB4_CONN_DRIVER_CLASS=org.hsqldb.jdbcDriver
+DB4_CONN_URL=jdbc:hsqldb:file:../data/dbt/hsql/ggc_db
+DB4_CONN_USERNAME=sa
+DB4_CONN_PASSWORD=
+DB4_HIBERNATE_DIALECT=org.hibernate.dialect.HSQLDialect
+
+
+#
+# Look and Feel Settings
+#
+
+LF_NAME=SkinLF
+LF_CLASS=com.l2fprod.gui.plaf.skin.SkinLookAndFeel
+SKINLF_SELECTED=modernthemepack_orig.zip
+
+
+#
+# Db Selector
+#
+SELECTED_DB=0
+
+
+#
+# Language Selector
+#
+SELECTED_LANG=en
Copied: trunk/ggc-desktop/data/lang/DbTool_Languages.properties (from rev 1392, trunk/ggc-desktop/data/lang/GGC_Languages.properties)
===================================================================
--- trunk/ggc-desktop/data/lang/DbTool_Languages.properties (rev 0)
+++ trunk/ggc-desktop/data/lang/DbTool_Languages.properties 2016-12-25 17:55:57 UTC (rev 1436)
@@ -0,0 +1,71 @@
+#
+# DbTool Languages
+#
+# Don't edit by hand
+#
+
+
+
+VERSION=0.1
+AVAILABLE_LANGUAGES=1
+AVAILABLE_LANGUAGES_WITH_HELP=0
+LANGPACK_DATE=26/11/2016 12:00
+LANGUAGE_ROOT=DbTool
+DEFAULT_HELP=en
+
+
+#
+# Language 1 - English (English)
+#
+LANG_1=en
+LANG_1_NAME=English
+LANG_1_HELP_AVAILABLE=No
+LANG_1_HELP=No
+LANG_1_FILE=DbTool_en.properties
+LANG_1_LOCALE=en
+LANG_1_LOCALE_COUNTRY=
+LANG_1_LOCALE_ISO=
+
+
+
+
+#
+# Language 2 - Slovene (Slovenski)
+#
+
+LANG_2=si
+LANG_2_NAME=Slovenski
+LANG_2_HELP_AVAILABLE=Yes
+LANG_2_HELP=Yes
+LANG_2_LOCALE=si
+LANG_2_LOCALE_COUNTRY=
+LANG_2_LOCALE_ISO=
+
+
+
+#
+# Language 3 - German (Deutsch)
+#
+LANG_3=de
+LANG_3_NAME=Deutsch
+LANG_3_HELP_AVAILABLE=No
+LANG_3_HELP=Yes
+LANG_3_LOCALE=de
+LANG_3_LOCALE_COUNTRY=
+LANG_3_LOCALE_ISO=
+
+
+#
+# Language 4 - French
+#
+LANG_4=fr
+LANG_4_NAME=French
+LANG_4_HELP_AVAILABLE=No
+LANG_4_HELP=Yes
+LANG_4_LOCALE=fr
+LANG_4_LOCALE_COUNTRY=
+LANG_4_LOCALE_ISO=
+
+
+
+
Deleted: trunk/ggc-desktop/doc/Changelog_old
===================================================================
--- trunk/ggc-desktop/doc/Changelog_old 2016-12-25 17:53:59 UTC (rev 1435)
+++ trunk/ggc-desktop/doc/Changelog_old 2016-12-25 17:55:57 UTC (rev 1436)
@@ -1,900 +0,0 @@
-
-Changelog file for GGC (GNU Gluco Control)
-==========================================
-
-Newer entries are on top, older on bottom.
-
---------------------------------------------------------------------------------------------------
-
-0.4.4
- * Meter Tool data is now added also into database for pump
-
-0.4.3 (16.3)
- * Dynamic loading of data finished
- * Startup tools changed
-
-
-0.4.2
- * Continue work on dynamic loading of Nutrition data
- * Dynamic loading now works for printing
-
-0.4.1.2 (28.2.2009)
- * Correct dates are now printed in Food Menu reports
-
-0.4.1.1 (17.2.2009)
- * All printing now uses abstract core file
- * All printing is now done to \data\print
- * All printing jobs create real names now, with real data in name (AT)
- * Started work on dynamic loading of Nutrition data
-
-0.4.1
- * Bug fixing HbA1c graph display
- * Printing files problem
-
-0.4 (2.2.2009) Andy Rozman <and...@us...>
- * Version is changed, since all functionality is finished for new version
- * Changes in documentation
-
-0.3.16 (17.1.2009) Andy Rozman <and...@us...>
- * Finished Spread Graph
- * Graph Development stopped for Release 0.4
- * Frequency graph is disabled
- * Course graph was tagged as not working 100%, this one is still in second version
- of graph framework (we are not working on 3rd one, which is final one)
-
-0.3.15 (10.1.2009) Andy Rozman <and...@us...>
- * fixed Freetext food entries processing (problem with parsing floats)
- * Refresh panels mechanism redone
- * Panels refresh when data from Meter plugin is processed
-
-
-0.3.14 (1.1.2009) Andy Rozman <and...@us...>
- * changed free-text food entries. Horizontal scroll disabled.
- * Graph changes. Working on Spread Graph, and GGC Controller class, we created
- new PlotSelectorPanel and PlotSelectorData from existing classes and extended
- both of them (we are not dependant on any of current implementations anymore)
- *
-
-0.3.13 (29.12.2008) Andy Rozman <and...@us...>
- * Changed printing to use abstract class
- * Change to PrintingDialog to use correct command when calling application from
- non-windows environment
- * changed free-text food entries (minor bug)
-
-0.3.12 (27.12.2008) Andy Rozman <and...@us...>
- * more functionality to panels on main screen (selectable updates to main screen)
- * added function to write free text for foods and accompanying CH values
- * integration into old daily entry
-
-0.3.11 (22.12.2008) Andy Rozman <and...@us...>
- * integrating new graph framework (ATGraphFramework)
- * implementation of HbA1c view for ATGraphFramework
- * implementation of Daily view for ATGraphFramework
- * ATech Tools Requirement: v0.2.10
-
-0.3.10
- * adding comments
- * changed main view of application
-
-2008-11-12 (0.3.9) Andy Rozman <and...@us...>
- * Fixed nutrition processing. Minor bug
-
-2008-10-10 (0.3.8) Andy Rozman <and...@us...>
- * Most of printing of food menus done (missing just ext 3 type, which will be added later, if req.)
- * Continuning to work on pump plugin base functionality (see Changes.txt in pump tool project)
-
-2008-10-02 (0.3.7) Andy Rozman <and...@us...>
- * Added dialog for starting printing for food menu
- * Printing of base food menu has errors: meals are displayed as their sub-items not as meal as whole, and some
- months throw exception. Work on this is suspended for time being.
- * Added/finished 'How_To_Update.txt' and 'Update_0.3.1.txt' documents.
-
-2008-09-24 (0.3.6) Andy Rozman <and...@us...>
- * Changing PrintFoodMenuBase class
- * Extending DayValuesData to include date strings (localized)
-
-2008-09-9 (0.3.5) Andy Rozman <and...@us...>
- * Added DayValuesData, which is used to contain DailiValues instances. It will either replace or super_class
- WeeklyValues and MonthlyValues and all such collection classes
- * Printing context will be extended. PrintAbstract class was created and all old Printing classes will use it
- in the future, for now it will be used by PrintFoodMenu* classes
- * Adding and moving entries in BUGS.txt
- * Statistics for BG fixed in main application panel and in Daily Stats panel
-
-2008-08-24 (0.3.4) Reinhold Rumberger <ru...@us...>
- * re-implemented the course graph using JFreeChart; code is extremely redundant
- and should be rather slow.
- * finished DataPlotSelectorPanel
-
-2008-08-24 Reinhold Rumberger <ru...@us...>
- * finished commenting new classes
- * brought GGC_de up-to-date
-
-2008-08-24 Reinhold Rumberger <ru...@us...>
- * created MathUtils (abstract to prevent instantiation)
-
-2008-08-22 Reinhold Rumberger <ru...@us...>
- * Added sample data to the graphs in the preferences.
- * Deprecated part of GGCProperties so that it can be cleaned up a little (also sorted members
- to make it easier to find the required member).
- * renamed ggc.gui.view to ggc.gui.graphs
- * created ggc.gui.dialogs.graphs and moved relevant classes there
- * created DataPlotSelectorPanel and PlotData, so that no GraphViews need to depend on their
- dialogs anymore.
-
-
-2008-08-22 Reinhold Rumberger <ru...@us...>
- * migrated HbA1cView to JFreeChart, made HbA1cDialog use BorderLayout to get descent scaling.
- * BUGS.txt updated
-
-2008-08-21 Reinhold Rumberger <ru...@us...>
- * started using JFreeChart, using DailyGraphView to get to know it.
-
-2008-08-20 (0.3.3) Andy Rozman <and...@us...>
- * 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) Andy Rozman <and...@us...>
- * Bolus Helper fixes
- * Source code changes to remove java warnings
-
-2008-08-13 (0.3.1) Andy Rozman <and...@us...>
- * Bolus Helper first implementation (needed some fixes and also extended and basic ratios done)
-
-
-2008-07-26 (0.3) Andy Rozman <and...@us...>
- * Version for release, minor changes to language file will be done for german language (probably), but
- officialy we are in code freeze.
- * README.si translation finished
-
-2008-07-24 (0.2.23) Andy Rozman <and...@us...>
- * Finished and integrated Restore functionality
- * Application is ready for release. There are just few translations to finish and we are ready to go.
-
-2008-07-10 Andy Rozman <and...@us...>
- * Integrated Pump Tool into GGC
-
-2008-07-06 Reinhold Rumberger <ru...@us...>
- * Some translation
- * noticed that README.de line delimiter was LF and converted to CRLF
-
-2008-07-05 Reinhold Rumberger <ru...@us...>
- * GGCMeterTool_de.properties prepared for translation & brought keys up-to-date
- * cleaned up german language files' headers to make them look slightly more presentable
-
-2008-07-04 (0.2.22) Andy Rozman <and...@us...>
- * Meter Tool implementation finished and tied into GGC (fully integrated)
-
-2008-07-04 Reinhold Rumberger <ru...@us...>
- * README.de translated, Keys in GGC_*de brought up-to-date
- * Added GGC_*de.native.properties, so that others can make changes that won't
- be overwritten.
- * moved version info to ggc.GGC, where it belongs; used Source->Format on
- ggc.GGC
- * Changelog: tabs -> spaces
-
-
-2008-07-02 (0.2.21) Andy Rozman <and...@us...>
- * added documentation
- * fixed food problem (we need to find out what is problem with decimals in java)
-
-2008-06-30 (0.2.20.4) Andy Rozman <and...@us...>
- * Error dialog finsihed and integrated into Printing Dialog (this is first dialog that uses extended
- error dialogs)
-
-2008-06-29 (0.2.20.3) Andy Rozman <and...@us...>
- * fixed problem with adding new foods and meals
- * fixed problem with meals tree (ids and refresh)
- * tooltips are added with foods and meals, labels for name are usually long, so we also set tooltip so that
- whole name is visible
-
-2008-06-28 (0.2.20.2) Andy Rozman <and...@us...>
- * added JDecimalTextField to atech-tools, which needs to replace JFormattedTextField used for decimal numbers
- replaced elements in Daily Values
- * On new Daily Value, hour is set to current hour
-
-2008-06-25 (0.2.20.1) Andy Rozman <and...@us...>
- * Changed CGM databases
- * Db Version Change: Stable: v7, Development: v8
- * Addded backup of Settings
- * Total SVN directory structure redone
- * fixed a lot of warnings
-
-2008-06-24 Reinhold Rumberger <ru...@us...>
- * updated GGC_de & GGC_Nutrition_de to include all new keywords
-
-2008-06-20 (0.2.19.1) Andy Rozman <and...@us...>
- * Changed plugin system and moved instances of plugins into DataAccess class
- * Added CGMS context (Continous Glucose Monitoring System), see IDEAS file
- * Created runner for DbInit, DbApplication, DbImport
- * Daily overview now displays date in title, and Sunday is now colored red (label)
-
-2008-06-15 (0.2.18.2) Andy Rozman <and...@us...>
- * Db Check was fully implemented and now Db Checking was added on start of application. If version of
- database is not the same as those specified in GGC_Update.properties software doesn't start
-
-2008-06-10 (0.2.18.1) Andy Rozman <and...@us...>
- * Db Version Change: Stable: v6, Development: v7
- * We are now officaially using USDA SR-20 (older DBs were filled with SR-18)
- * There were several tables added for Pump Tool, it shouldn't be done before the end of year, but it
- might happen. Designing of tables is finished, and probably there will be at least import for
- some of pumps (for Roche's family which uses Smart Pix device, which will be supported soon)
-
-2008-06-08 (0.2.17.1) Andy Rozman <and...@us...>
- * data fix of HbA1c (new formula and we calculate values for last 3 months)
- * also fixed dialog for HbA1c
- * fixed calculations of foods (wrong display of values in MealView and calculation in DailyValues)
-
-2008-05-25 (0.2.16.2) Andy Rozman <and...@us...>
- * bug fixing foods stuff
- * added glycemic processing as seperate entity (not finished yet), maels db is currently not working
- with connection to adding to daily values
- * menus changes
-
-2008-05-25 (0.2.16.1) Andy Rozman <and...@us...>
- * GGC Little was changed. Button for meter removed and upper left corner is now tabbed, so that it can contain
- several panels.
- * Added panels to GGC Little: plug-ins panel, stocks panel, and older ones were reformed a little.
- * bug fixing all GGC Little stuff in bugs
-
-2008-05-24 (0.2.15) Andy Rozman <and...@us...>
- * changes to nutrition tables
- * Changes to database xml files, new version of Internal Db (H2), now it also has some foods in user table
- * Db Version Change: Stable: v5, Development: v6
- * README is now written and ready for deployment (translation of readme is needed, for each language)
- * changes to english lang file
- * Slovenian translation finished (for now)
- * changed main theme
- * some minor changed in code (some dialogs were readjusted)
-
-2008-05-23 Reinhold Rumberger <ru...@us...>
- * README: spell & grammar check
- * README.de: startet
-
-2008-05-20 (0.2.14) Andy Rozman <and...@us...>
- * adding log4j support to GGCDb and some other important classes
- * checking log4j configurations
-
-2008-05-21 Reinhold Rumberger <ru...@us...>
- * fixed date display bug in course graph - still looks ugly though
- * GGCLittle now uses the same about-dialog as the rest of ggc
- * translation
- * corrected bug in DailyValues: getDayAndMonthAsString() and getDateAsString()
-
-2008-05-19 Reinhold Rumberger <ru...@us...>
- * Fixed a bug where selecting cancel in "Meals, Foods Selector"
- (or selecting nothing) would cause several NullPointerExceptions
- * translation
-
-2008-05-15 (0.2.13) Andy Rozman <and...@us...>
- * bug fixes to nutrition database gui (should be working, testing is
- underway).
-
-2008-05-14 (0.2.12) Andy Rozman <and...@us...>
- * Implementation of DailyValueEntry adding Food (connecting foods
- databases, with daily entries)
- * some bugs fixed
- * Atech-Tools 0.1.14 needed
-
-2008-05-11 Reinhold Rumberger <ru...@us...>
- * translation
- * changed the statistics to display counts as integers (as there can be no
- such thing as half an injection)
- * fixed division-by-zero in getAvgBG()
- * new bugs
-
-2008-05-08 (0.2.11) Andy Rozman <and...@us...>
- * Changes to database xml files, new version of Internal Db (H2)
- * Db Version Change: Stable: v4, Development: v5
-
-2008-05-03 (0.2.10) Andy Rozman <and...@us...>
- * Startup has gone through big changes, UpdateConfig has changed much
- so now Atech Tools (0.1.13) is needed
- * Started work on Daily Values input for Foods
-
-2008-04-30 (0.2.9.12) Andy Rozman <and...@us...>
- * Backup implementation finished
- * Added some pumps menus (still in planning... don't worry)
-
-2008-04-29 (0.2.9.11) Andy Rozman <and...@us...>
- * Backup implementation 0.1 finished (non-gui backup)
- * Backup implementation 0.2 started (GUI)
- * Daily Values input changed: validation done via JFormattedTextField, added
- values for both types of BG (we had one before, but switching types make
- that impossible). Double click opens edit.
-
-2008-04-24 Reinhold Rumberger <ru...@us...>
- * german translation
-
-2008-04-18 Reinhold Rumberger <ru...@us...>
- * german translation: keywords brought up-to-date
- * GGC_Nutrition initialized
- * slight corrections to english language files
-
-2008-03-22 (0.2.9.10) Andy Rozman <and...@us...>
- * some files were moved to different packages (ggc.core package created), we
- have now more distinct split beetween files for creation of different jars
- From now on, we create 4 jars:
- - ggc-core.jar: contains all classes needed by any GUI
- - ggc-main.jar: contains main GUI (for main application)
- - ggc-little.jar: containing Little GUI (resident version of GGC, that
- can input only data for today)
- - ggc-lang.jar: contains all language files and help files
- * Nutrition and meals functionalities completed
- * language files were split. Now we have main language file and nutrition
- language file, which also contains translation for Nutritions in database
- * changes to ant files (added new libraries, more jars creation and
- versioning of created jars)
- * export of nutrition db done (need to rework whole import/export stuff)
- * work started on connecting nutrition databases to daily values entries
-
-
-2008-03-22 (0.2.9.9) Andy Rozman <and...@us...>
- * see BUGS.txt (some of bugs were fixed)
-
-2008-03-22 (0.2.9.8) Andy Rozman <and...@us...>
- * many changes in atech-tools, added selector, abstract DataAccess and some
- other files. It is now required to use version of atech-tools
- directly from sourceforge (SVN)
- * changed db loading. Partitial loading and menus/toolbar displaying
- * changed database to refect multi person functionality
- * added javahelp framework
- * added help buttons in whole application
- * through whole application icons were added and some code chenged to
- be able to do this
- * meal db added and 80% implemented
- * usda nutrition db fixed (90% done)
- * user nutrition db work started (about 40% done)
-
-2008-03-02 Reinhold Rumberger <ru...@us...>
- * german translation
-
-2008-02-13 Reinhold Rumberger <ru...@us...>
- * added new keys to GGC_de
- * fixed graph display offset bug
-
-2008-02-13 Reinhold Rumberger <ru...@us...>
- * added entries from BUGS.txt marked with [sf] to sourceforge's bugtracker
-
-2008-02-13 (0.2.9.7) Andy Rozman <and...@us...>
- * source code changes to be compilable on java 1.5
- (java 1.5 compatibility must be maintained) !!!!
- * use of atech-tools 0.1.9 required (java 1.5 compatibility issue)
- * implementation of update/startup mechanism started in atech-tools (0.1.9), files
- added to support testing on GGC. Startup will be implemented first, because update
- functionality needs to have server side done, which will take some time.
- * jar files creation will change in near future (instead of two files, we will produce
- 3: ggc, ggc-core and ggc-little). ggc will contains files specific to main gui, while
- core contains all data, db and utill classes. ggc-little contains only GGC Little
- specific code. Change is planned and division has started.
-
-2008-02-08 (0.2.9.6) Andy Rozman <and...@us...>
- * major changed to whole nutrition db and framework
- * final changes to USDA nutrition databases
- * menu changes
- * finalized changes to Printing (added Extended)
- * display plug-ins: meters_tool and pumps tool
-
-
-2008-01-29 (0.2.9.5) Andy Rozman <and...@us...>
- * fixing daily input values
-
-2008-01-02 Reinhold Rumberger <ru...@us...>
- * fix for NumberFormatException when no BG is entered
- * a BG of 0 isn't shown as a value in the table or the dialog anymore
-
-2008-01-21 Reinhold Rumberger <ru...@us...>
- * removed YOUR_CURRENT from GGC_en and GGC_de
- * key "SPREAD_GRAPH" seems to have gone missing
- * some more translation
- * documented some bugs
-
-2008-01-20 (v0.2.9.2 - 0.2.9.4) Andy Rozman <and...@us...>
- * Added code for future versions
- * Import of old DailyValues data (from 0.3 export or MeterTool), just class, no gui
- * fixing of several warnings that Eclipse produced
- * main display changed, instead schedule we now have schedule and stocks.
- * added dialogs for doctors and appointments (visible through developer version)
- * changed code a little, to allow starting GGC in development mode (add any paramter
- to startup class)
- * atech-tools 0.1.8 linked to project
- * meter tool project started (it's in same SVN just in another directory). All changes
- that are relevant to meters (and not directly to GGC main are visible from path
- /ggc-meter). TO-DO file is also changed, all meter specific tasks have been moved
- to ggc-meter project.
- * ant build files changed (GGCBuild.properties_default)
- * nutrition (usdb) db view fixed, nutrition (USDb) is with this change finished
-
-2008-01-20 Reinhold Rumberger <ru...@us...>
- * removed a couple of @Override Tags to make to project compile again
- * sync between GGC_de and GGC_en
- * small correction of slovene that slipped into GGC_en
- * fixed some small problems with graphs display when no data is present
-
-2008-01-13 Reinhold Rumberger <ru...@us...>
- * updated german translation
- * corrected english translation
- * small fix to maintain ability to translate to german
-
-2008-01-12 Reinhold Rumberger <ru...@us...>
- * updated german translation to include new strings (no actual translation yet)
-
-2008-01-06 (v0.2.9.1) Andy Rozman <and...@us...>
- * adding new daily entry changed, some options are still unavailable, but it has totally new look
- * BG data is now written in mg/dl format, user can select on entry in which format he wishes to write
- * about dialog finalized
- * bugs with daily data fixed
- * delete changed
- * added new menus for future functionalities
- * fixed menu's mnemonic display
- * slovenian translation updated
- * meter support removed, at least for any new devices ... meter support will be done through separate
- project, called meter_tool in next release
- * changes to main gui
- * atech-tools 0.1.7 linked to project (about dialog mainly, several component: DateTimeComponent,
- I18nControl moved)
- * build fixed, with support for newer version of libraries (ggc-support updated)
-
-
-
-2006-04-04 Reinhold Rumberger <ru...@us...>
- * updated german translation
-
-2006-04-02 (v0.2.5.3) Andy Rozman <and...@us...>
- * Bug fixes (from BUGS.txt):
- - In Preferences->General: changing language also changes selected L&F name, but not class
- - Changed preferences mostly apply only after restart (names, language)
- - hba1c of 2.09% with ZERO readings...
-
-
-2006-04-01 (v0.2.5.2) Andy Rozman <and...@us...>
- * Fixing reading of configuration
- * Refresh of Info panels fixed
- * Extensive database changes, a lot of added files to ggc.db.hibernate (some of files also removed):
- - added: Doctors (doctor types, doctors, appointments), Stocks (stock type, srock subtype, stocks),
- Nutrition (added global data, changed nutrition from usdb, added user nutrition db, changed
- meals definitions), Meter (meter companies, meters, meter interface (for import), meter
- implementations), Inet stuff (inet group, inet links, ...)
- * Some file rename in ggc.db.datalayer
- * Loading and init of Nutrition database changed
- * Added User Nutrition Database
- * Display USDB Nutrition Database
- * Changed menus: restructuring, added entries: Stocks, Doctors, Appointments, Database Maintainance,
- User Nutrition Database, Meter List (added are items, not functionality).
- * Meter Management will be done in Database. We will try to have database filled with all different
- meters available arround, those that are supported by GGC will have some other entries, so
- that user has overview over most available meters. (so far list has 34 meters, only 3 are supported
- to be read by application, another 7 are in the works (Ascensia) and will be available in 0.4 version
- (End of 2007)
-
-
-2006-03-21 (v0.2.4.2) Reinhold Rumberger <ru...@us...>
- * german translation
- * several bugs in BUGS.txt
- * fixed bug in displaying graphs' y-axis labels
-
-2006-03-13 Reinhold Rumberger <ru...@us...>
- * updated german translation
-
-2006-03-11 (v0.2.4.1) Andy Rozman <and...@us...>
- * Color scheme settings
- * Configuration work finished - probably
-
-2006-03-10 (v0.2.3.1) Andy Rozman <and...@us...>
- * Loading L&F at startup
- * Changing some debug information for Db
-
-2006-03-06 (v0.2.2.10 - 8) Andy Rozman <and...@us...>
- * Configuration save fixed
- * General settings
- o Setting Db
- o Setting Look and Feel (and saving info to configuration file)
-
-2006-01-24 Reinhold Rumberger <ru...@us...>
- * made path to javax.comm.properties in DataAccess system-independant
-
-2006-01-23 (v0.2.2.7) Andy Rozman <and...@us...>
- * New configuration tables are now used (old databases won't work anymore)
- * Fixing of configuration stuff:
- o Meter Configuration fixed
-
-2006-01-21 Reinhold Rumberger <ru...@us...>
- * build.xml: ggc_l might now work again
- * translation
-
-2006-01-05 Reinhold Rumberger <ru...@us...>
- * make run.sh work
-
-2006-01-03 Reinhold Rumberger <ru...@us...>
- * new idea in IDEAS
-
-2006-12-27 (v0.2.2.6) Andy Rozman <and...@us...>
- * DailyRowDialog is replaced with older version, since new version is not working
- yet
- * Added new code for supporting meters
- * Added new dialog for meters
- * Meters support is in early testing phase, old meters code is disabled for now
-
-2006-12-26 Reinhold Rumberger <ru...@us...>
- * GGCDb: - made connection detail fields protected instead of public since other
- packages have no business reading things like password and username
- - used constants for loadStatus to make code more readable and future
- changes easier
-
-2006-12-15 Reinhold Rumberger <ru...@us...>
- * InitDb, NutritionImport: prevent probably buggy code from being reached
- * StatisticInfoPanel: - renamed to StatisticsInfoPanel
- - commented out unnecessary if
- * added @Override were it was necessary
- * removed unnecessary casts
- * DataAccess: replaced calls to deprecated methods
-
-2006-09-07 Reinhold Rumberger <ru...@us...>
- * README: removed first preliminary release target date
- * GGC_de.properties: some more translation
-
-2006-09-05 Reinhold Rumberger <ru...@us...>
- * I18nControl: minor changes to the code
-
-2006-08-09 Reinhold Rumberger <ru...@us...>
- * Added new strings to GGC_de
- * Some general cleanup and java 1.5 niceties
-
-2006-06-09 Reinhold Rumberger <ru...@us...>
- * Added new strings to GGC_de, some translation
- * Some rewording in GGC_en
-
-2006-06-08 (v0.2.2.5) Andy Rozman <and...@us...>
- * Added saving of Rendering settings
-
-2006-05-08 (v0.2.2.4) Andy Rozman <and...@us...>
- * Printing Dialog for selection of month and year which to print
- * Basic installer script, which be used to create deployment file for Windows
- (NSIS). Deployment file for linux will be created at later time (as tar.gz
- image).
- * Printing report internationalized, keywords added to master file (english).
- * Slovenian translation for printing added
- * Fixed problem with Daily graph display in Daily Stats Dialog
-
-2006-05-02 (v0.2.2.3) Andy Rozman <and...@us...>
- * MonthlyValues changed to work for simple PDF reports
- * Create Simple PDF Reports (works with hardcoded values so far)
- we can print only 2006 month 4, and times settings for meals are
- hardcoded. Dialog to select date is not ready and times settings
- must be done in config (in next release).
-
-2006-04-28 (v0.2.2.2) Andy Rozman <and...@us...>
- * Meter handling. There are new files added for meter handling. I plan to add
- support for some of meters in future, and I will change way how to get data.
- Old will be used same way as now, but new ones will use new dialog and new
- interfaces.
- * moved ggc.errors to ggc.data.errors
- * moved ggc.event to ggc.data.event
- * moved ggc.print to ggc.data.print and renamed and added one file (for simple
- and extended printing)
- * moved ggc.nutrition to ggc.gui.nutrition
-
-
-2006-04-27 (v0.2.2.1) Andy Rozman <and...@us...>
- * moved ggc.datamodels to ggc.data
- * moved GGCDb and GGCDbLoader to ggc.db (from ggc.db.datalayer)
- * changes to configuration (Colors)
- * start working on printing (added PrintingDialog, MonthlyValues)
- * looking at meter import tool, trying to fix all exception that are thrown
- if no meter present
-
-2006-04-26 Reinhold Rumberger <ru...@us...>
- * README: some spellchecking and rewording
-
-2006-04-25 (v0.2.1.13) Andy Rozman <and...@us...>
- * Removal of DatabaseHandler and HibernateHandler. All classes were changed to
- use Db directly trhorugh DataAccess static class
- * Fixing of GGCLittle to use new database schema (Hibernate)
- * Visual changes to GGCLittle
- * Fixed add, editing, deleting and graph display, from functional point of view
- GGCLittle is working, but from visual point of view, there is still work to
- do (about, meter import, add/edit should be centered).
-
-2006-04-23 Andy Rozman <and...@us...>
- * update of slovene language file
- * some of translation done
-
-2006-04-23 Reinhold Rumberger <ru...@us...>
- * GGC_de.properties:
- - merged in changes from GGC_en.properties
- - sorted in alphabetical order
- * moved ggcl.jar form the build directory to the binary directory in ant build task "jar_l"
- * more translation...
- * GGC_en.properties: removed superfluous "MEALS"
-
-2006-04-19 Andy Rozman <and...@us...>
- * changes to README file
- * added two tasks into ant: style_devel, style_deploy, which are used for
- style checks (checkstyle-all-4.1.jar needed in lib/devel)
- * fixed a lot of code so that is conformant with programming style guide
- * updated ggc_db_nutr.zip and test_nutrition.zip with new versions of database
- and config files, so that they now also contain config (which is almost finished)
-
-2006-04-18 (v0.2.1.12) Andy Rozman <and...@us...>
- * Color schemes changed, we reference colorscheme by name and not by id.
-
-2006-04-15 Reinhold Rumberger <ru...@us...>
- * had to merge in some conflicts in DataAccess.java; hope I made no mistakes.
- It compiles so I can't have broken too much...
- * GGC_de.properties: merged in changes from GGC_en.properties
- * added NO_DATABASE_FOUND to GGC_en.properties
- * README: changed "CVS" to "SVN"
- * added run.sh, the bash equivalent of run.cmd -- Note: some classpaths seem to be missing
-
-2006-04-15 (v0.2.1.11) Andy Rozman <and...@us...>
- * fixed Statistics (BG / Insulin) and Hba1c display
- * fixed AbstractGraphView problem
- * fixed display of daily graphs in day stats
- * fixed control panels of daily graph (date selector was displayed very ugly, and
- all texts for check and select elements were displayed to close to control
-
-2006-04-14 (v0.2.1.10) Andy Rozman <and...@us...>
- * moved ggc.gui.PropertiesFrame to ggc.gui.cfg.PropertiesDialog, and changed internal
- workings, so that after properties are done, we can save all setting and not just the
- current as it was till now.
- * changed DailyStatsDialog to display graph and ti display error if no row was selected.
- * fixed AbstractGraphView
- * added methods for set to GGCProperties (for insulins, bg's and general data)
- * PropertiesDialog fixed save/apply and cancel
- * medical data added new configuration stuff (bg unit, settings for both bg units) and
- fixed saving
-
-2006-04-13 (v0.2.1.9) Andy Rozman <and...@us...>
- * continuing work on config in db
- * loading of selected language (from config file)
- * general setting of properties are working
-
-2006-04-11 (v0.2.1.8) Andy Rozman <and...@us...>
- * added I18nCheck tool to help translators by translation (they display keywords
- not available in language file)
- * started removing config file. All settings will be stored in database, except database
- settings and language settings
- * changed GGCProperties, and changed all callings of this class to DataAccess where
- GGCProperties is instantiated.
-
-2006-04-10 (v0.2.1.7) Andy Rozman <and...@us...>
- * moved ggc.view.* to ggc.gui.view.*
- * Renamed and made as JDialog: CourseGraphFrame, DailyGraphFrame, FrequenceGraphFrame,
- SpreadGraphFrame, and fixed.
-
-2006-04-10 (v0.2.1.6) Andy Rozman <and...@us...>
- * Some bug fixes in Graphs. Now graphs are displayed. This code is not finished
- yet, but it's now usable without getting any exceptions.
- * Configuration of meters now displays meters correctly
- * Added Time calculation methods in DataAccess (we got wrong time as
- GregorianCalendar and database returned nothing).
-
-2006-04-10 Reinhold Rumberger <ru...@us...>
- * new function getDisplayedBG() in DataAccess, not used yet
-
-2006-04-08 Reinhold Rumberger <ru...@us...>
- * started changing AbstractGraphView to make selection of BG unit type possible
- * added unit to BG axis in DailyGraphView, couldn't do others as I can't access them
- * DataAccess: "public static void" inf field should've been "public static final"
- * corrected html in GGC_en.properties and added articles
- * some more translation in GGC_de.properties
- * ggc.little.DailyStatsPanel: made changes neccessary due to the deletion of AddRowFrame
- * added inherited abstract methods to DummyHandler, they return empty objects
- * MainFrame: made version info final, major formatting changes, as my tab width (4 spaces)
- and the obviously used tab width (8 spaces) just didn't mix
- * changes '-' to '*' in TO-DO.txt to make diff reading easier
- * added IDEAS
-
-2006-04-07 (v0.2.1.3-v0.2.1.5) Andy Rozman <and...@us...>
- * Changes to DailyValues, DailyValuesRow (set methods)
- * Added Weekly values (problem when reading a range of days from database)
- * Fixed statistics
- * Changed DatePanels (names), day, month, year
- * Minor fixes in Properties (removed database contexts, fixed setting of COMs)
- * Fixes in loading of database, daydata and weekdata are made static, so that we
- don't need to make so much calls to database
- * Using DailyRowDailog for adding data
- * Using DailyRowDailog for editing existing data
- * Added and fixed strings in GGC_en
- * Deleted AddRowFrame and EditRowFrame
- * Fixes over code against changes of DatePanel
- * More extensive use of DataAccess class (static data instances)
- * Added MeterManager class, which has definitions of all available meters, which
- was stored in configuration
- * Display meters in Configuration
-
-2006-04-07 Reinhold Rumberger <ru...@us...>
- * moved ggc.db_tool to ggc.db.db_tool, as per package entries in the files in ggc.db_tool
- * merged changes from GGC_en.properties into GGC_de.properties
-
-2006-04-05 Reinhold Rumberger <ru...@us...>
- * Some more translation in GGC_de.properties
- * added NUTRITION, ..., NO_LOCAL_DATA_AVAILABLE to GGC_de.properties, would
- appreciate their addition to GGC_en.properties
- * Added error message if host unavailable for update checking
- (HOST_UNAVAILABLE_INFO, HOST_UNAVAILABLE_MSG)
- * ggc.util.VersionChecker.isNewVersion:
- - made variable names more intuitive assuming the code is correct ;-P
- - added javadoc comment for that method
- * build/build.xml: translation files don't have to be specified individually anymore
-
-2006-04-04 (v0.2.1.2) Andy Rozman <and...@us...>
- * DailyStatsFrame was moved and renamed to dialogs.DailyStatsDialog
- * Adding DailyRowDailog for editing and later adding rows
- * Fixed ggc.gui.calendar.dayPanel to be displayed correctly
-
-2006-03-25 (v0.2.1) Andy Rozman <and...@us...>
- * Changed MainFrame (Status, Added menus for future features (meals, nutrition, pdf reports)
- * Added loading of Hibernate (in seperate thread) and show loading in MainFrame
- * More usage of DataAccess class, added several functions
- * Add daily values tables in hibernate
- * Added doctors, doctorType and appointments tables in hibernate
- * Implemented methods and classes for working with daily values in Hibernate
- * Removed all database support except hibernate
- * Changed DailyValues and DailyValuesRow
- * Changed StatisticValues and command for getting data over several days
- * Added Nutrition Dialog start to GGC Main (Nutrition Dialog not completed yet)
- * Added some entries to GGC_en.properties
- * Fixed build.xml
-
-2006-03-11 Reinhold Rumberger <ru...@us...>
- * ggc.util.I18nControl:
- - made private static final Locale defaultLocale and set it to Locale.ENGLISH
- - set Locale.defaultLocale() to defaultLocale; this will make ResourceBundle look
- here for entries it can't find in the current locale and look at this locale if
- the required locale couldn't be found
- * ggc.util.GGCPropertiesHelper: made some Strings final
- * renamed GGC_XX.properties to GGC_xx.properties
- * ggc.db.TextFileHandler: see XXX comments
- * fixes: fixed some exceptions
- * GGC_en.properties:
- added TIME_MUST_BE_IN_FORMAT, DE, EN, SI, YOUR_LANGUAGE, INIT
- removed YOUR_CURRENT
- * GGC_de.properties: translation continues
- * corrected incorrect error message about date format being incorrect when really
- time format was meant and squashed an exception thrown when this occurred
- * ggc.util.GGCProperties: data.imports.* changed to ggc.data.imports.*
- * BUG: data import from meter throws a ClassCastException in
- javax.swing.AbstractButton.configurePropertiesFromAction on line 1117 (attempted
- cast to Integer, I'm too unfamiliar with the Actions used here to be able to
- further debug anything)
- * BUG: Daily stats -> add row -> change day -> add some values in the add row frame
- ..-> new entry -> NO error, exception or anything wrong looking -> change back to
- ..original day: no new entries, either here or anywhere else
- * added language selection to prefPane; implementation is rather hackish and a
- restart is required if this setting is changed; the main problem with this
- implementation is an endless loop because the constructor of GGCProperties
- depends on I18nControl
-
-2006-03-11 Andy Rozman <and...@us...>
- * Moved ANT build files to build directory and removed all those in root
- * ARCHITECTURE CHANGE: I added Hibernate (v3.1) framework to ggc (download in support as
- hibernate3.zip). For now hibernate is used just for nutrition part, but after I
- finish nutrition and meals, I will change all other code, to use hibernate. With
- this we will remove several files needed for talking to different database.
- Hibernate is object relational database framework, which can talk to almost any
- database without any change to our code.
- * Finished nutrition import
- * Added hibernate data classes, datalayer classes and main GGCDb class which handle
- hibernate database. With this we have database support for nutrition module.
- * Added classes for working with nutrition. Tree dialog is finished, also TreeModel,
- but I still need to change panels that display info on selected tree item. This
- code is now available, but is so far not added to ggc. For testing this you must
- set an external database, get jdbc driver for it, set user, password and empty
- database, then write this settings to GGC_Config.properties under database 1 (or
- you can add one for yourself and set SELECTED_DB value). After you have all this
- you can unpack test_nutrition.zip to your build directory (where all compiled
- classes go), then you take USDA_Nutrient_Db_for_Standard_Reference_r18.zip from
- ggc-support cvs tree and unpack it to ../data/nutrition (from your build directory).
- First you run nut_init for initialization of database and it's filling and then
- you can use nut_tree to see nutrition tree.
- * Fixed comments in ggc.little package
-
-2006-03-10 Reinhold Rumberger <ru...@us...>
- * ggc.util.GGCPropertiesHelper: method read(): made error message in case of
- IOException a bit more verbose
- * GGC_DE.properties: more translation
-
-2006-03-05 Reinhold Rumberger <ru...@us...>
- * OK, figured out problem with compiling ggc.little.DailyStatsPanel: this seems to
- require java 1.5
- * ggc.util.GGCPropertiesHelper: undid a change to the data dir path that was supposed
- to be local but forgotten
- * looks like eclipse committed my .classpath and .cvsignore, trying to fix
-
-2006-03-04 Reinhold Rumberger <ru...@us...>
- * GGC_DE.properties: some more work on the translation
- * GGC_EN.properties: some spellchecking, no version or date changes since
- this doesn't really imply that other translations need to be adopted
- * ggc.util.I18nControl:
- - moved header to the top
- - made EN the fallback default locale, as english is the master language file
- * ggc.gui.main.MainFrame:
- - hardcoded skin location in a field at the top of the file instead of somewhere
- in the code, to make this a tiny little bit more flexible
- - changed the path in accordance with cvs repository layout
- * ggc.util.GGCPropertiesHelper: pretty much same as above for data directory and
- config file location
- * MANIFEST.MF: I think this meant ggc.GGC, not just ggc (in Main-Class)
- * ggc.little.LittleInfoPanel: had wrong package declaration
- * ggc.little.DailyStatsPanel: doesn't seem to compile here (see "// XXX:" comment)
- * PROBLEM: There suddenly are some mysterious "org.apache.commons" and "org.hibernate"
- imports I can't seem to resolve
-
-2006-03-01 Reinhold Rumberger <ru...@us...>
- * ggc.data.imports.*: a char -> int cast is unnecessary, deleted them.
- * ggc.view.CourseGraphView: same for int -> float casts
- If those casts were there for a reason, please feel free to re-insert
- them and tell me how stupid I am :-P
- * randomly scattered throughout the project, hopefully not creating too
- many conflicts:
- - optimized import section (<Shift> - <O> in eclipse)
- - added several questions (see TODO comments)
- * ggc.util.VersionChecker: added two questions, if I forget to start
- a discussion, could somebody else, please?
- * GGC_DE.properties: Added newest version of my German translation
-
-2005-06-13 Andy Rozman <and...@us...> (Version 0.0.2)
- * fixed some packages
- * added also *.gif images, since png and xmp are not always displayed
- * added HSQL database
- * added internationalization through whole software
-
-2002-08-29 Dieter Schultschik <sc...@us...>
-
- * Checking for new version implemented.
- * created package ggc. moved everything from src into ggc.
-
-2002-08-28 Dieter Schultschik <sc...@us...>
-
- * Stephan has re-written the whole Data-Import.
- * Today I merged his changes, and now its in CVS.
- * DataSelector now has Spinners.
-
-2002-08-01 Dieter Schultschik <sc...@us...>
-
- * Select Meter and SerialPort in preferences.
-
-2002-07-31 Dieter Schultschik <sc...@us...>
-
- * Textfile Handler completed.
- * some bugfixes.
- * Ability to test the MySQL connection from prefs.
-
-2002-07-30 Dieter Schultschik <sc...@us...>
-
- * Added option to store data in a textfile.
- * lots of small fixes and improvements.
- * some stuff doesn't work very smooth at the moment.
- (will be fixed in the next days)
-
-2002-07-29 Dieter Schultschik <sc...@us...>
-
- * Added a new SpreadView.
- * Added a new FrequencyView.
- * Added a new HbA1cView.
-
-2002-07-26 Dieter Schultschik <sc...@us...>
-
- * Added a new CourseView. (will get more options in the future)
- * Many small improvements.
- * Added Options to customize colors in the Views.
-
-2002-07-18 Dieter Schultschik <sc...@us...>
-
- * Added Icons to ToolBar.
-
-2002-07-17 Dieter Schultschik <sc...@us...>
-
- * Better DB Handling (Ability to Connect and Disconnect)
- * Added a StatusBar to the Mainframe
-
-2002-07-16 Dieter Schultschik <sc...@us...>
-
- * Added sources to sourceforge cvs.
-
-2002-04-01 Dieter Schultschik <sc...@us...>
-
- * Starting to work on ggc.
-
Modified: trunk/ggc-desktop/doc/GGC_Supported_Hardware.html
===================================================================
--- trunk/ggc-desktop/doc/GGC_Supported_Hardware.html 2016-12-25 17:53:59 UTC (rev 1435)
+++ trunk/ggc-desktop/doc/GGC_Supported_Hardware.html 2016-12-25 17:55:57 UTC (rev 1436)
@@ -67,20 +67,11 @@
<td width="10%">Support in GGC</td>
<td width="10%">Since GGC Version</td>
<td width="10%">Planned Support</td>
+ <td width="10%">Interface</td>
<td width="10%">Developer</td>
<td>Comment</td>
</tr>
- <tr bgcolor="#3cb371">
- <td>Ascensia/Bayer</td>
- <td>Contour Link</td>
- <td>Level 2</td>
- <td>Done</td>
- <td>0.3</td>
- <td> </td>
- <td>Andy</td>
- <td> </td>
- </tr>
<tr bgcolor="#3cb371">
<td>Ascensia/Bayer</td>
@@ -95,17 +86,6 @@
<tr bgcolor="#3cb371">
<td>Ascensia/Bayer</td>
- <td>Contour Link</td>
- <td>Level 2</td>
- <td>Done</td>
- <td>0.3</td>
- <td> </td>
- <td>Andy</td>
- <td> </td>
- </tr>
-
- <tr bgcolor="#3cb371">
- <td>Ascensia/Bayer</td>
<td>Dex2</td>
<td>Level 2</td>
<td>Done</td>
@@ -147,8 +127,20 @@
<td></td>
</tr>
- <tr bgcolor="#6495ed">
+
+ <tr bgcolor="#3cb371">
<td>Ascensia/Bayer</td>
+ <td>Contour Link</td>
+ <td>Level 2</td>
+ <td>Done</td>
+ <td>0.3</td>
+ <td> </td>
+ <td>Andy</td>
+ <td>Just meter readings</td>
+ </tr>
+
+ <tr bgcolor="#3cb371">
+ <td>Ascensia/Bayer</td>
<td>Contour USB</td>
<td>Level 2</td>
<td>Done</td>
@@ -158,7 +150,7 @@
<td> </td>
</tr>
- <tr bgcolor="#6495ed">
+ <tr bgcolor="#3cb371">
<td>Ascensia/Bayer</td>
<td>Contour Next</td>
<td>Level 2</td>
@@ -169,7 +161,7 @@
<td> </td>
</tr>
- <tr bgcolor="#6495ed">
+ <tr bgcolor="#3cb371">
<td>Ascensia/Bayer</td>
<td>Contour Next USB</td>
<td>Level 2</td>
@@ -180,7 +172,7 @@
<td> </td>
</tr>
- <tr bgcolor="#6495ed">
+ <tr bgcolor="#3cb371">
<td>Ascensia/Bayer</td>
<td>Contour Next Link</td>
<td>Level 2</td>
@@ -188,7 +180,7 @@
<td>0.6.1</td>
<td> </td>
<td>Andy</td>
- <td> </td>
+ <td>Just meter readings for now.</td>
</tr>
<tr bgcolor="#3cb371">
@@ -1033,6 +1025,29 @@
the same, if you have one, you can just make another copy of same file or link)<br>
<br>
+<br>
+<br>
+<h3>Appendix C: USB devices with Linux (possibly also Mac)</h3>
+<br>
+1. Add your user into group plugdev<br>
+Add your user into group plugdev (this is the group under which USB devices are loaded as default).
+Please google "udev" for your computer, if this sollutions doesn't work for you.<br>
+<br>
+2. Add rule in /etc/udev/rules.d<br>
+Create file 44-ggc-devices.rules and add entry like this:<br>
+SUBSYSTEM=="usb", ATTR{idVendor}=="1a79", MODE="0666", GROUP="plugdev"<br>
+<br>
+You will need to change ATTR{idVendor} to your device company. You can determine your devices company
+if you execute command 'lsusb' and looking for your device, you should find it... There will be a list
+like this:<br>
+<br>
+<i>Bus 003 Device 011: ID 1a79:7410 Bayer Health Care LLC Contour Next</i><br>
+<br>
+In this case 1a79 is company id (idVendor).<br>
+<br>
+<br>
+
+
</body>
</html>
\ No newline at end of file
Modified: trunk/ggc-desktop/doc/HardwareLibraries.txt
===================================================================
--- trunk/ggc-desktop/doc/HardwareLibraries.txt 2016-12-25 17:53:59 UTC (rev 1435)
+++ trunk/ggc-desktop/doc/HardwareLibraries.txt 2016-12-25 17:55:57 UTC (rev 1436)
@@ -48,7 +48,7 @@
OS: Windows, Linux
Own version: Yes
Comment: This is old IBM Serial API library used for Bluetooth support for Dana pump. Needs to be replaced,
- but at time of implementation, our serial library at that timeRxtx 2.1.7, had problems with BT
+ but at time of implementation, our serial library at that time Rxtx 2.1.7, had problems with BT
devices. Our current NrJavaSerial is actually just extension of RXTX 2.2, so it might actually
support this now, but we can't test it at this time (no hardware).
Deleted: trunk/ggc-desktop/doc/README_1st
===================================================================
--- trunk/ggc-desktop/doc/README_1st 2016-12-25 17:53:59 UTC (rev 1435)
+++ trunk/ggc-desktop/doc/README_1st 2016-12-25 17:55:57 UTC (rev 1436)
@@ -1,137 +0,0 @@
-
-GGC - GNU Gluco Control
-=======================
-
-This are short instructions on how to start the application.
-
-All java programs need special environment to run, it's called Java Runtime Environment (JRE) or
-Java Development Kit (JDK, it contains JRE). On some OSes we can have problems detecting if this
-JRE or JDK is installed. Because of this most of software packages, also contain JRE in their
-install package (we have one windows install package that also contains JRE).
-
-For GGC you need to have at least Java 1.5, but 1.6 is preferred.
-
-Problem is that this JRE is different for each platform (also for each hardware version of platform),
-so we need to do some things, to make GGC to run.
-You can choose to do one of these things:
-
-1.) Modify system path to include path to your existing JRE installation.
- You can check if this is set if you run following command 'java -version'. If you get
- 'file not found' error then this is not set.
-
-2.) Copy JRE files into jre directory under GGC
- Now you have two options here. If you have java already installed on your system (your
- browser sometimes install this automatically to handle java applets) you can copy the
- files from there. Usually they are under C:\Program Files\Java\jre<version> on windows
- and somewhere under /usr/local/java on linux. You need to copy all files under jre<something>
- directory to <GGC-Installed>\jre directory.
- 2nd option is to download correct VM from 'USB Release' section. This is file that is meant
- for installation to USB disks (coming soon). All tested VMs are there, so if you find
- VM there you should not have any problems. You need to download VM zip file and extract
- certain files. In the archive you will find a directory with the name of the VM (in case of windows,
- directory is called Windows) under that directory there is jre_<version><OS-tags> directory.
- Copy all files under there into GGC\jre directory. If your OSes VM is not there, then you
- will have to use the one installed on system.
-
-3.) Modify config files
- How to modify config files is described in section C.), but please read also through
- sections A) and B)
-
-
-
-A) How to start software
-=========================
-
-1.) Windows
-After install program should run by itself (by clicking on icon), if it doesn't, you will need to
-troubleshoot. Run cmd.exe (command line shell, search for icon Command Prompt) and run following
-command: run_win.cmd. Error should be written somewhere on screen.
-In most cases problem is with java path ('java' is not recognized as an internal or external command,
-operable program or batch file). In this case follow instructions under C): 1.
-
-
-2.) Linux
-On linux platform you need to issue following command 'sh run_linux.sh'. If application doesn't start
-see on screen where the...
[truncated message content] |
|
From: <and...@us...> - 2016-12-25 18:04:33
|
Revision: 1438
http://sourceforge.net/p/ggc/code/1438
Author: andyrozman
Date: 2016-12-25 18:04:29 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Pumps
- move files
Modified Paths:
--------------
trunk/ggc-desktop-app/pom.xml
Added Paths:
-----------
trunk/ggc-desktop-app/ggc-desktop/.amateras
trunk/ggc-desktop-app/ggc-desktop/.settings/
trunk/ggc-desktop-app/ggc-desktop/build/
trunk/ggc-desktop-app/ggc-desktop/build/build.xml
trunk/ggc-desktop-app/ggc-desktop/data/
trunk/ggc-desktop-app/ggc-desktop/data/DbTool_Config.properties_default
trunk/ggc-desktop-app/ggc-desktop/data/lang/DbTool_Languages.properties
trunk/ggc-desktop-app/ggc-desktop/doc/
trunk/ggc-desktop-app/ggc-desktop/doc/GGC_Supported_Hardware.html
trunk/ggc-desktop-app/ggc-desktop/doc/HardwareLibraries.txt
trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO Detailed.txt
trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO.txt
trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO_Hardware.txt
trunk/ggc-desktop-app/ggc-desktop/doc/archive/
trunk/ggc-desktop-app/ggc-desktop/doc/database_info.txt
trunk/ggc-desktop-app/ggc-desktop/doc/usb/
trunk/ggc-desktop-app/ggc-desktop/pom.xml
Removed Paths:
-------------
trunk/ggc-desktop/.amateras
trunk/ggc-desktop/.settings/
trunk/ggc-desktop/build/
trunk/ggc-desktop/data/
trunk/ggc-desktop/doc/
trunk/ggc-desktop/pom.xml
trunk/ggc-desktop-app/ggc-desktop/build/build.xml
trunk/ggc-desktop-app/ggc-desktop/doc/Changelog_old
trunk/ggc-desktop-app/ggc-desktop/doc/GGC_Supported_Hardware.html
trunk/ggc-desktop-app/ggc-desktop/doc/HardwareLibraries.txt
trunk/ggc-desktop-app/ggc-desktop/doc/README_1st
trunk/ggc-desktop-app/ggc-desktop/doc/README_1st.de
trunk/ggc-desktop-app/ggc-desktop/doc/README_1st.si
trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO Detailed.txt
trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO.txt
trunk/ggc-desktop-app/ggc-desktop/doc/TO-DO_Hardware.txt
trunk/ggc-desktop-app/ggc-desktop/doc/USB-How-To.txt
trunk/ggc-desktop-app/ggc-desktop/doc/USB-How-To_de.txt
trunk/ggc-desktop-app/ggc-desktop/doc/USB-How-To_si.txt
trunk/ggc-desktop-app/ggc-desktop/doc/database_info.txt
trunk/ggc-desktop-app/ggc-desktop/doc/old_docs/
Deleted: trunk/ggc-desktop/.amateras
===================================================================
--- trunk/ggc-desktop/.amateras 2016-12-25 17:58:00 UTC (rev 1437)
+++ trunk/ggc-desktop/.amateras 2016-12-25 18:04:29 UTC (rev 1438)
@@ -1,12 +0,0 @@
-#EclipseHTMLEditor configuration file
-#Wed Dec 03 16:47:43 CET 2008
-validateDTD=false
-javaScriptCompleters=
-useDTD=false
-validateJSP=false
-validateXML=false
-validateJS=false
-removeMarkers=false
-root=/
-validateHTML=false
-javaScripts=
Deleted: trunk/ggc-desktop/pom.xml
===================================================================
--- trunk/ggc-desktop/pom.xml 2016-12-25 17:58:00 UTC (rev 1437)
+++ trunk/ggc-desktop/pom.xml 2016-12-25 18:04:29 UTC (rev 1438)
@@ -1,157 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath>
- </parent>
-
- <name>GGC Desktop Project</name>
-
- <artifactId>ggc-desktop</artifactId>
- <version>${ggc-desktop.version}</version>
-
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-help</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-meter-tool</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-pump-tool</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-cgms-tool</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-nutri-tool</artifactId>
- </dependency>
-
- <!--
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-connect-tool</artifactId>
- </dependency>
--->
-
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>skinlf</artifactId>
- </dependency>
-
- <!--
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
--->
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <!-- Is Required ?? -->
-
- <!--
- <dependency>
- <groupId>org.simpleframework</groupId>
- <artifactId>simple-xml</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.lingala.zip4j</groupId>
- <artifactId>zip4j</artifactId>
- </dependency>
--->
-
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.4-702.jdbc3</version>
- </dependency>
-
-
- <!--
- <dependency>
- <groupId>info.clearthought</groupId>
- <artifactId>table-layout-j15</artifactId>
- <version>1.0</version>
- </dependency>
- -->
-
- <dependency>
- <groupId>info.clearthought</groupId>
- <artifactId>table-layout</artifactId>
- </dependency>
-
-
- <!-- <dependency> <groupId>org.swinglabs</groupId> <artifactId>pdf-renderer</artifactId>
- </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId>
- </dependency> -->
-
-
- </dependencies>
-</project>
Copied: trunk/ggc-desktop-app/ggc-desktop/.amateras (from rev 1431, trunk/ggc-desktop/.amateras)
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/.amateras (rev 0)
+++ trunk/ggc-desktop-app/ggc-desktop/.amateras 2016-12-25 18:04:29 UTC (rev 1438)
@@ -0,0 +1,12 @@
+#EclipseHTMLEditor configuration file
+#Wed Dec 03 16:47:43 CET 2008
+validateDTD=false
+javaScriptCompleters=
+useDTD=false
+validateJSP=false
+validateXML=false
+validateJS=false
+removeMarkers=false
+root=/
+validateHTML=false
+javaScripts=
Deleted: trunk/ggc-desktop-app/ggc-desktop/build/build.xml
===================================================================
--- trunk/ggc-desktop/build/build.xml 2016-12-25 17:14:28 UTC (rev 1431)
+++ trunk/ggc-desktop-app/ggc-desktop/build/build.xml 2016-12-25 18:04:29 UTC (rev 1438)
@@ -1,184 +0,0 @@
-<?xml version="1.0" ?>
-<project name="GNU Gluco Control" default="build" basedir=".">
- <description>
- Build file for GGC Desktop
- </description>
-
- <!-- Environment properties read from a file ...-->
- <property file="../../build/AtechTools.properties"/>
- <property file="../../ggc-core/build/GGCBuild.properties"/>
- <property file="./GGC_Desktop_Version.properties"/>
- <property file="../../ggc-core/build/GGC_Core_Version.properties"/>
-
-
- <!-- These should *not* be modified on the command line! -->
- <property name="build.dir" value="${outdir.dir}/classes"/>
- <property name="deploy.dir" value="${outdir.dir}/deploy"/>
-
-
- <!-- Build GGC -->
-
- <target name="build">
- <echo message=" ************************************************* "/>
- <echo message=" **** GGC Build **** "/>
- <echo message=" ************************************************* "/>
- <echo message=""/>
- <echo message=" copy = copies all needed files"/>
- <echo message=" clean = clean build dir"/>
- <echo message=" build_ggc (make) = build GGC (recompile classes)"/>
- <echo message=" jar = create GGC jar"/>
- <echo message=" jar_'part' = create specified GGC jar"/>
- <echo message=" available parts are: core, lang, little, main"/>
- <echo message=" jars_full = all jars"/>
- <echo message=" full = clean, build_ggc, copy, jars_full"/>
- <echo message=" deploy = full, copy files to main directory"/>
- <echo message=" dist = full, and create distribution zip file (contains needed libs, and data files)" />
- <echo message=" style (_devel, _deploy) = checkstyle against our rules" />
- <echo message=""/>
- </target>
-
-
- <!-- Public targets -->
-
- <target name="clean" description="Clean build directory and previus version of GGC">
- <delete dir="${build.dir}/ggc"/>
- <delete dir="${build.dir}/com"/>
- <delete dir="${build.dir}/org"/>
- <delete dir="${build.dir}/icons"/>
- <delete file="${build.dir}/ggc-main*.jar"/>
- <delete file="${build.dir}/ggc-little*.jar"/>
- </target>
-
-
- <target name="copy" description="Copy all needed files">
- <copy todir="${build.dir}/" overwrite="true">
- <fileset dir="${source.dir}" casesensitive="no">
- <include name="GGC_*.properties"/>
- </fileset>
- </copy>
- <mkdir dir="${build.dir}/icons" />
- <copy todir="${build.dir}/icons" overwrite="true">
- <fileset dir="${source.dir}/icons" casesensitive="no">
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- </fileset>
- </copy>
- </target>
-
-
-
-
- <target name="make" description="Build GGC">
- <javac srcdir="${source.dir}"
- destdir="${build.dir}"
- includes="ggc/**, org/**, com/**"
- excludes="ggc/db/DummyHandler.java, ggc/db/HSQLHandler.java, ggc/db/MySQLHandler.java, ggc/db/TextFileHandler.java, ggc/data/meter2/**"
- deprecation="off" debug="true"> <!-- debug="${debug} DummyHandler.java, ggc/db/HSQLHandler.java, ggc\db\MySQLHandler, ggc/db/TextFileHandler.java" -->
-
- <classpath>
- <pathelement path="${hibernate_cpath}" />
- <pathelement path="${utils_cpath}"/>
- <pathelement path="${classpath.full}"/>
- <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar"/>
- </classpath>
- </javac>
- </target>
-
- <target name="build_ggc" description="Build GGC" />
-
-<!--
-
- includes="ggc/**"
- excludes="ggc/db/**"
-
-
--->
-
- <target name="jar_main" description="Build GGC Main GUI jar" depends="make">
- <jar jarfile="${binary.dir}/ggc-main-${ggc-main.version}.jar"
- update="false"
- index="false"
- manifest="./manifest_ggc.mf">
-
- <fileset dir="${build.dir}">
- <include name="ggc/GGC.class"/>
- <include name="ggc/gui/**"/>
- <exclude name="ggc/gui/little/**"/>
- <include name="icons/*.gif"/>
- <include name="icons/*.jpg"/>
- <include name="icons/*.png"/>
- </fileset>
- </jar>
- </target>
-
-
-
-
-
-
- <target name="jar_little" description="Build GGC Little" depends="make">
- <jar jarfile="${binary.dir}/ggc-little-${ggc-little.version}.jar"
- update="false"
- index="false"
- manifest="./manifest_ggc_little.mf">
-
- <fileset dir="${build.dir}">
- <include name="ggc/gui/little/**"/>
- <include name="ggc/gui/view/**"/>
- <include name="icons/*.gif"/>
- <include name="icons/*.jpg"/>
- <include name="icons/*.png"/>
- </fileset>
- </jar>
- </target>
-
-
- <target name="dev" depends="clean, copy, make">
- </target>
-
-
- <target name="jars_full" depends="jar_main, jar_little">
- </target>
-
-
- <target name="full" depends="clean, copy, jars_full">
- </target>
-
- <target name="deploy" depends="full">
- <copy file="${binary.dir}/ggc-main-${ggc-main.version}.jar" todir="../../build/deploy_files/"/>
- <copy file="${binary.dir}/ggc-little-${ggc-little.version}.jar" todir="../../build/deploy_files/"/>
- </target>
-
-
- <target name="dist">
- <echo message="This option is not available yet." />
- </target>
-
-
- <target name="style_deploy">
- <taskdef resource="checkstyletask.properties" classpath="${library.dir}/devel/checkstyle-all-4.1.jar" />
-
- <checkstyle config="ggc_deploy.xml">
- <fileset dir="${source.dir}" includes="**/*.java"/>
-
- <formatter type="plain"/>
- <formatter type="xml" toFile="checkstyle_errors.xml"/>
- </checkstyle>
-
- </target>
-
- <target name="style_devel">
- <taskdef resource="checkstyletask.properties" classpath="${library.dir}/devel/checkstyle-all-4.1.jar" />
-
- <checkstyle config="ggc_devel.xml">
- <fileset dir="${source.dir}" includes="**/*.java"/>
-
- <formatter type="plain"/>
- <formatter type="xml" toFile="checkstyle_errors.xml"/>
- </checkstyle>
- </target>
-
-
-</project>
-
Copied: trunk/ggc-desktop-app/ggc-desktop/build/build.xml (from rev 1436, trunk/ggc-desktop/build/build.xml)
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/build/build.xml (rev 0)
+++ trunk/ggc-desktop-app/ggc-desktop/build/build.xml 2016-12-25 18:04:29 UTC (rev 1438)
@@ -0,0 +1,184 @@
+<?xml version="1.0" ?>
+<project name="GNU Gluco Control" default="build" basedir="">
+ <description>
+ Build file for GGC Desktop
+ </description>
+
+ <!-- Environment properties read from a file ...-->
+ <property file="../../build/AtechTools.properties"/>
+ <property file="../../ggc-core-app/ggc-core/build/GGCBuild.properties"/>
+ <property file="GGC_Desktop_Version.properties"/>
+ <property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/>
+
+
+ <!-- These should *not* be modified on the command line! -->
+ <property name="build.dir" value="${outdir.dir}/classes"/>
+ <property name="deploy.dir" value="${outdir.dir}/deploy"/>
+
+
+ <!-- Build GGC -->
+
+ <target name="build">
+ <echo message=" ************************************************* "/>
+ <echo message=" **** GGC Build **** "/>
+ <echo message=" ************************************************* "/>
+ <echo message=""/>
+ <echo message=" copy = copies all needed files"/>
+ <echo message=" clean = clean build dir"/>
+ <echo message=" build_ggc (make) = build GGC (recompile classes)"/>
+ <echo message=" jar = create GGC jar"/>
+ <echo message=" jar_'part' = create specified GGC jar"/>
+ <echo message=" available parts are: core, lang, little, main"/>
+ <echo message=" jars_full = all jars"/>
+ <echo message=" full = clean, build_ggc, copy, jars_full"/>
+ <echo message=" deploy = full, copy files to main directory"/>
+ <echo message=" dist = full, and create distribution zip file (contains needed libs, and data files)" />
+ <echo message=" style (_devel, _deploy) = checkstyle against our rules" />
+ <echo message=""/>
+ </target>
+
+
+ <!-- Public targets -->
+
+ <target name="clean" description="Clean build directory and previus version of GGC">
+ <delete dir="${build.dir}/ggc"/>
+ <delete dir="${build.dir}/com"/>
+ <delete dir="${build.dir}/org"/>
+ <delete dir="${build.dir}/icons"/>
+ <delete file="${build.dir}/ggc-main*.jar"/>
+ <delete file="${build.dir}/ggc-little*.jar"/>
+ </target>
+
+
+ <target name="copy" description="Copy all needed files">
+ <copy todir="${build.dir}/" overwrite="true">
+ <fileset dir="${source.dir}" casesensitive="no">
+ <include name="GGC_*.properties"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${build.dir}/icons" />
+ <copy todir="${build.dir}/icons" overwrite="true">
+ <fileset dir="../../ggc-desktop-app/ggc-desktop/src/main/resources/icons" casesensitive="no">
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+
+
+ <target name="make" description="Build GGC">
+ <javac srcdir="${source.dir}"
+ destdir="${build.dir}"
+ includes="ggc/**, org/**, com/**"
+ excludes="ggc/db/DummyHandler.java, ggc/db/HSQLHandler.java, ggc/db/MySQLHandler.java, ggc/db/TextFileHandler.java, ggc/data/meter2/**"
+ deprecation="off" debug="true"> <!-- debug="${debug} DummyHandler.java, ggc/db/HSQLHandler.java, ggc\db\MySQLHandler, ggc/db/TextFileHandler.java" -->
+
+ <classpath>
+ <pathelement path="${hibernate_cpath}" />
+ <pathelement path="${utils_cpath}"/>
+ <pathelement path="${classpath.full}"/>
+ <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="build_ggc" description="Build GGC" />
+
+<!--
+
+ includes="ggc/**"
+ excludes="ggc/db/**"
+
+
+-->
+
+ <target name="jar_main" description="Build GGC Main GUI jar" depends="make">
+ <jar jarfile="${binary.dir}/ggc-main-${ggc-main.version}.jar"
+ update="false"
+ index="false"
+ manifest="manifest_ggc.mf">
+
+ <fileset dir="${build.dir}">
+ <include name="ggc/GGC.class"/>
+ <include name="ggc/gui/**"/>
+ <exclude name="ggc/gui/little/**"/>
+ <include name="icons/*.gif"/>
+ <include name="icons/*.jpg"/>
+ <include name="icons/*.png"/>
+ </fileset>
+ </jar>
+ </target>
+
+
+
+
+
+
+ <target name="jar_little" description="Build GGC Little" depends="make">
+ <jar jarfile="${binary.dir}/ggc-little-${ggc-little.version}.jar"
+ update="false"
+ index="false"
+ manifest="manifest_ggc_little.mf">
+
+ <fileset dir="${build.dir}">
+ <include name="ggc/gui/little/**"/>
+ <include name="ggc/gui/view/**"/>
+ <include name="icons/*.gif"/>
+ <include name="icons/*.jpg"/>
+ <include name="icons/*.png"/>
+ </fileset>
+ </jar>
+ </target>
+
+
+ <target name="dev" depends="clean, copy, make">
+ </target>
+
+
+ <target name="jars_full" depends="jar_main, jar_little">
+ </target>
+
+
+ <target name="full" depends="clean, copy, jars_full">
+ </target>
+
+ <target name="deploy" depends="full">
+ <copy file="${binary.dir}/ggc-main-${ggc-main.version}.jar" todir="../../build/deploy_files/"/>
+ <copy file="${binary.dir}/ggc-little-${ggc-little.version}.jar" todir="../../build/deploy_files/"/>
+ </target>
+
+
+ <target name="dist">
+ <echo message="This option is not available yet." />
+ </target>
+
+
+ <target name="style_deploy">
+ <taskdef resource="checkstyletask.properties" classpath="${library.dir}/devel/checkstyle-all-4.1.jar" />
+
+ <checkstyle config="ggc_deploy.xml">
+ <fileset dir="${source.dir}" includes="**/*.java"/>
+
+ <formatter type="plain"/>
+ <formatter type="xml" toFile="checkstyle_errors.xml"/>
+ </checkstyle>
+
+ </target>
+
+ <target name="style_devel">
+ <taskdef resource="checkstyletask.properties" classpath="${library.dir}/devel/checkstyle-all-4.1.jar" />
+
+ <checkstyle config="ggc_devel.xml">
+ <fileset dir="${source.dir}" includes="**/*.java"/>
+
+ <formatter type="plain"/>
+ <formatter type="xml" toFile="checkstyle_errors.xml"/>
+ </checkstyle>
+ </target>
+
+
+</project>
+
Copied: trunk/ggc-desktop-app/ggc-desktop/data/DbTool_Config.properties_default (from rev 1436, trunk/ggc-desktop/data/DbTool_Config.properties_default)
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/data/DbTool_Config.properties_default (rev 0)
+++ trunk/ggc-desktop-app/ggc-desktop/data/DbTool_Config.properties_default 2016-12-25 18:04:29 UTC (rev 1438)
@@ -0,0 +1,88 @@
+#
+# GGC_Config (Settings for GGC)
+#31.7.2010 13:11:37
+#
+# Don't edit by hand
+# Only settings need for application startup are written here. All other info
+# is stored in database
+#
+
+#
+# Databases settings
+#
+
+#
+# Database #0 - Internal Db (H2)
+#
+DB0_CONN_NAME=Internal Db (H2)
+DB0_DB_NAME=H2 SQL
+DB0_CONN_DRIVER_CLASS=org.h2.Driver
+DB0_CONN_URL=jdbc:h2:../data/db/ggc_db
+DB0_CONN_USERNAME=sa
+DB0_CONN_PASSWORD=
+DB0_HIBERNATE_DIALECT=org.hibernate.dialect.H2Dialect
+
+#
+# Database #1 - PostgreSQL Database (v7)
+#
+DB1_CONN_NAME=PostgreSQL Database (v7)
+DB1_DB_NAME=PostgreSQL
+DB1_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB1_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v7?user=ggc&password=ggc
+DB1_CONN_USERNAME=ggc
+DB1_CONN_PASSWORD=ggc
+DB1_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #2 - PostgreSQL Database (v3)
+#
+DB2_CONN_NAME=PostgreSQL Database (v3)
+DB2_DB_NAME=PostgreSQL
+DB2_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB2_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v3?user=ggc&password=ggc
+DB2_CONN_USERNAME=ggc
+DB2_CONN_PASSWORD=ggc
+DB2_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #3 - PostgreSQL Database (ggc_test2)
+#
+DB3_CONN_NAME=PostgreSQL Database (ggc_test2)
+DB3_DB_NAME=PostgreSQL
+DB3_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB3_CONN_URL=jdbc:postgresql://localhost:5432/ggc_test2?user=ggc&password=ggc
+DB3_CONN_USERNAME=ggc
+DB3_CONN_PASSWORD=ggc
+DB3_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #4 - Internal Database
+#
+DB4_CONN_NAME=Internal Database
+DB4_DB_NAME=HypersonicSQL File
+DB4_CONN_DRIVER_CLASS=org.hsqldb.jdbcDriver
+DB4_CONN_URL=jdbc:hsqldb:file:../data/dbt/hsql/ggc_db
+DB4_CONN_USERNAME=sa
+DB4_CONN_PASSWORD=
+DB4_HIBERNATE_DIALECT=org.hibernate.dialect.HSQLDialect
+
+
+#
+# Look and Feel Settings
+#
+
+LF_NAME=SkinLF
+LF_CLASS=com.l2fprod.gui.plaf.skin.SkinLookAndFeel
+SKINLF_SELECTED=modernthemepack_orig.zip
+
+
+#
+# Db Selector
+#
+SELECTED_DB=0
+
+
+#
+# Language Selector
+#
+SELECTED_LANG=en
Copied: trunk/ggc-desktop-app/ggc-desktop/data/lang/DbTool_Languages.properties (from rev 1436, trunk/ggc-desktop/data/lang/DbTool_Languages.properties)
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/data/lang/DbTool_Languages.properties (rev 0)
+++ trunk/ggc-desktop-app/ggc-desktop/data/lang/DbTool_Languages.properties 2016-12-25 18:04:29 UTC (rev 1438)
@@ -0,0 +1,71 @@
+#
+# DbTool Languages
+#
+# Don't edit by hand
+#
+
+
+
+VERSION=0.1
+AVAILABLE_LANGUAGES=1
+AVAILABLE_LANGUAGES_WITH_HELP=0
+LANGPACK_DATE=26/11/2016 12:00
+LANGUAGE_ROOT=DbTool
+DEFAULT_HELP=en
+
+
+#
+# Language 1 - English (English)
+#
+LANG_1=en
+LANG_1_NAME=English
+LANG_1_HELP_AVAILABLE=No
+LANG_1_HELP=No
+LANG_1_FILE=DbTool_en.properties
+LANG_1_LOCALE=en
+LANG_1_LOCALE_COUNTRY=
+LANG_1_LOCALE_ISO=
+
+
+
+
+#
+# Language 2 - Slovene (Slovenski)
+#
+
+LANG_2=si
+LANG_2_NAME=Slovenski
+LANG_2_HELP_AVAILABLE=Yes
+LANG_2_HELP=Yes
+LANG_2_LOCALE=si
+LANG_2_LOCALE_COUNTRY=
+LANG_2_LOCALE_ISO=
+
+
+
+#
+# Language 3 - German (Deutsch)
+#
+LANG_3=de
+LANG_3_NAME=Deutsch
+LANG_3_HELP_AVAILABLE=No
+LANG_3_HELP=Yes
+LANG_3_LOCALE=de
+LANG_3_LOCALE_COUNTRY=
+LANG_3_LOCALE_ISO=
+
+
+#
+# Language 4 - French
+#
+LANG_4=fr
+LANG_4_NAME=French
+LANG_4_HELP_AVAILABLE=No
+LANG_4_HELP=Yes
+LANG_4_LOCALE=fr
+LANG_4_LOCALE_COUNTRY=
+LANG_4_LOCALE_ISO=
+
+
+
+
Deleted: trunk/ggc-desktop-app/ggc-desktop/doc/Changelog_old
===================================================================
--- trunk/ggc-desktop/doc/Changelog_old 2016-12-25 17:14:28 UTC (rev 1431)
+++ trunk/ggc-desktop-app/ggc-desktop/doc/Changelog_old 2016-12-25 18:04:29 UTC (rev 1438)
@@ -1,900 +0,0 @@
-
-Changelog file for GGC (GNU Gluco Control)
-==========================================
-
-Newer entries are on top, older on bottom.
-
---------------------------------------------------------------------------------------------------
-
-0.4.4
- * Meter Tool data is now added also into database for pump
-
-0.4.3 (16.3)
- * Dynamic loading of data finished
- * Startup tools changed
-
-
-0.4.2
- * Continue work on dynamic loading of Nutrition data
- * Dynamic loading now works for printing
-
-0.4.1.2 (28.2.2009)
- * Correct dates are now printed in Food Menu reports
-
-0.4.1.1 (17.2.2009)
- * All printing now uses abstract core file
- * All printing is now done to \data\print
- * All printing jobs create real names now, with real data in name (AT)
- * Started work on dynamic loading of Nutrition data
-
-0.4.1
- * Bug fixing HbA1c graph display
- * Printing files problem
-
-0.4 (2.2.2009) Andy Rozman <and...@us...>
- * Version is changed, since all functionality is finished for new version
- * Changes in documentation
-
-0.3.16 (17.1.2009) Andy Rozman <and...@us...>
- * Finished Spread Graph
- * Graph Development stopped for Release 0.4
- * Frequency graph is disabled
- * Course graph was tagged as not working 100%, this one is still in second version
- of graph framework (we are not working on 3rd one, which is final one)
-
-0.3.15 (10.1.2009) Andy Rozman <and...@us...>
- * fixed Freetext food entries processing (problem with parsing floats)
- * Refresh panels mechanism redone
- * Panels refresh when data from Meter plugin is processed
-
-
-0.3.14 (1.1.2009) Andy Rozman <and...@us...>
- * changed free-text food entries. Horizontal scroll disabled.
- * Graph changes. Working on Spread Graph, and GGC Controller class, we created
- new PlotSelectorPanel and PlotSelectorData from existing classes and extended
- both of them (we are not dependant on any of current implementations anymore)
- *
-
-0.3.13 (29.12.2008) Andy Rozman <and...@us...>
- * Changed printing to use abstract class
- * Change to PrintingDialog to use correct command when calling application from
- non-windows environment
- * changed free-text food entries (minor bug)
-
-0.3.12 (27.12.2008) Andy Rozman <and...@us...>
- * more functionality to panels on main screen (selectable updates to main screen)
- * added function to write free text for foods and accompanying CH values
- * integration into old daily entry
-
-0.3.11 (22.12.2008) Andy Rozman <and...@us...>
- * integrating new graph framework (ATGraphFramework)
- * implementation of HbA1c view for ATGraphFramework
- * implementation of Daily view for ATGraphFramework
- * ATech Tools Requirement: v0.2.10
-
-0.3.10
- * adding comments
- * changed main view of application
-
-2008-11-12 (0.3.9) Andy Rozman <and...@us...>
- * Fixed nutrition processing. Minor bug
-
-2008-10-10 (0.3.8) Andy Rozman <and...@us...>
- * Most of printing of food menus done (missing just ext 3 type, which will be added later, if req.)
- * Continuning to work on pump plugin base functionality (see Changes.txt in pump tool project)
-
-2008-10-02 (0.3.7) Andy Rozman <and...@us...>
- * Added dialog for starting printing for food menu
- * Printing of base food menu has errors: meals are displayed as their sub-items not as meal as whole, and some
- months throw exception. Work on this is suspended for time being.
- * Added/finished 'How_To_Update.txt' and 'Update_0.3.1.txt' documents.
-
-2008-09-24 (0.3.6) Andy Rozman <and...@us...>
- * Changing PrintFoodMenuBase class
- * Extending DayValuesData to include date strings (localized)
-
-2008-09-9 (0.3.5) Andy Rozman <and...@us...>
- * Added DayValuesData, which is used to contain DailiValues instances. It will either replace or super_class
- WeeklyValues and MonthlyValues and all such collection classes
- * Printing context will be extended. PrintAbstract class was created and all old Printing classes will use it
- in the future, for now it will be used by PrintFoodMenu* classes
- * Adding and moving entries in BUGS.txt
- * Statistics for BG fixed in main application panel and in Daily Stats panel
-
-2008-08-24 (0.3.4) Reinhold Rumberger <ru...@us...>
- * re-implemented the course graph using JFreeChart; code is extremely redundant
- and should be rather slow.
- * finished DataPlotSelectorPanel
-
-2008-08-24 Reinhold Rumberger <ru...@us...>
- * finished commenting new classes
- * brought GGC_de up-to-date
-
-2008-08-24 Reinhold Rumberger <ru...@us...>
- * created MathUtils (abstract to prevent instantiation)
-
-2008-08-22 Reinhold Rumberger <ru...@us...>
- * Added sample data to the graphs in the preferences.
- * Deprecated part of GGCProperties so that it can be cleaned up a little (also sorted members
- to make it easier to find the required member).
- * renamed ggc.gui.view to ggc.gui.graphs
- * created ggc.gui.dialogs.graphs and moved relevant classes there
- * created DataPlotSelectorPanel and PlotData, so that no GraphViews need to depend on their
- dialogs anymore.
-
-
-2008-08-22 Reinhold Rumberger <ru...@us...>
- * migrated HbA1cView to JFreeChart, made HbA1cDialog use BorderLayout to get descent scaling.
- * BUGS.txt updated
-
-2008-08-21 Reinhold Rumberger <ru...@us...>
- * started using JFreeChart, using DailyGraphView to get to know it.
-
-2008-08-20 (0.3.3) Andy Rozman <and...@us...>
- * 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) Andy Rozman <and...@us...>
- * Bolus Helper fixes
- * Source code changes to remove java warnings
-
-2008-08-13 (0.3.1) Andy Rozman <and...@us...>
- * Bolus Helper first implementation (needed some fixes and also extended and basic ratios done)
-
-
-2008-07-26 (0.3) Andy Rozman <and...@us...>
- * Version for release, minor changes to language file will be done for german language (probably), but
- officialy we are in code freeze.
- * README.si translation finished
-
-2008-07-24 (0.2.23) Andy Rozman <and...@us...>
- * Finished and integrated Restore functionality
- * Application is ready for release. There are just few translations to finish and we are ready to go.
-
-2008-07-10 Andy Rozman <and...@us...>
- * Integrated Pump Tool into GGC
-
-2008-07-06 Reinhold Rumberger <ru...@us...>
- * Some translation
- * noticed that README.de line delimiter was LF and converted to CRLF
-
-2008-07-05 Reinhold Rumberger <ru...@us...>
- * GGCMeterTool_de.properties prepared for translation & brought keys up-to-date
- * cleaned up german language files' headers to make them look slightly more presentable
-
-2008-07-04 (0.2.22) Andy Rozman <and...@us...>
- * Meter Tool implementation finished and tied into GGC (fully integrated)
-
-2008-07-04 Reinhold Rumberger <ru...@us...>
- * README.de translated, Keys in GGC_*de brought up-to-date
- * Added GGC_*de.native.properties, so that others can make changes that won't
- be overwritten.
- * moved version info to ggc.GGC, where it belongs; used Source->Format on
- ggc.GGC
- * Changelog: tabs -> spaces
-
-
-2008-07-02 (0.2.21) Andy Rozman <and...@us...>
- * added documentation
- * fixed food problem (we need to find out what is problem with decimals in java)
-
-2008-06-30 (0.2.20.4) Andy Rozman <and...@us...>
- * Error dialog finsihed and integrated into Printing Dialog (this is first dialog that uses extended
- error dialogs)
-
-2008-06-29 (0.2.20.3) Andy Rozman <and...@us...>
- * fixed problem with adding new foods and meals
- * fixed problem with meals tree (ids and refresh)
- * tooltips are added with foods and meals, labels for name are usually long, so we also set tooltip so that
- whole name is visible
-
-2008-06-28 (0.2.20.2) Andy Rozman <and...@us...>
- * added JDecimalTextField to atech-tools, which needs to replace JFormattedTextField used for decimal numbers
- replaced elements in Daily Values
- * On new Daily Value, hour is set to current hour
-
-2008-06-25 (0.2.20.1) Andy Rozman <and...@us...>
- * Changed CGM databases
- * Db Version Change: Stable: v7, Development: v8
- * Addded backup of Settings
- * Total SVN directory structure redone
- * fixed a lot of warnings
-
-2008-06-24 Reinhold Rumberger <ru...@us...>
- * updated GGC_de & GGC_Nutrition_de to include all new keywords
-
-2008-06-20 (0.2.19.1) Andy Rozman <and...@us...>
- * Changed plugin system and moved instances of plugins into DataAccess class
- * Added CGMS context (Continous Glucose Monitoring System), see IDEAS file
- * Created runner for DbInit, DbApplication, DbImport
- * Daily overview now displays date in title, and Sunday is now colored red (label)
-
-2008-06-15 (0.2.18.2) Andy Rozman <and...@us...>
- * Db Check was fully implemented and now Db Checking was added on start of application. If version of
- database is not the same as those specified in GGC_Update.properties software doesn't start
-
-2008-06-10 (0.2.18.1) Andy Rozman <and...@us...>
- * Db Version Change: Stable: v6, Development: v7
- * We are now officaially using USDA SR-20 (older DBs were filled with SR-18)
- * There were several tables added for Pump Tool, it shouldn't be done before the end of year, but it
- might happen. Designing of tables is finished, and probably there will be at least import for
- some of pumps (for Roche's family which uses Smart Pix device, which will be supported soon)
-
-2008-06-08 (0.2.17.1) Andy Rozman <and...@us...>
- * data fix of HbA1c (new formula and we calculate values for last 3 months)
- * also fixed dialog for HbA1c
- * fixed calculations of foods (wrong display of values in MealView and calculation in DailyValues)
-
-2008-05-25 (0.2.16.2) Andy Rozman <and...@us...>
- * bug fixing foods stuff
- * added glycemic processing as seperate entity (not finished yet), maels db is currently not working
- with connection to adding to daily values
- * menus changes
-
-2008-05-25 (0.2.16.1) Andy Rozman <and...@us...>
- * GGC Little was changed. Button for meter removed and upper left corner is now tabbed, so that it can contain
- several panels.
- * Added panels to GGC Little: plug-ins panel, stocks panel, and older ones were reformed a little.
- * bug fixing all GGC Little stuff in bugs
-
-2008-05-24 (0.2.15) Andy Rozman <and...@us...>
- * changes to nutrition tables
- * Changes to database xml files, new version of Internal Db (H2), now it also has some foods in user table
- * Db Version Change: Stable: v5, Development: v6
- * README is now written and ready for deployment (translation of readme is needed, for each language)
- * changes to english lang file
- * Slovenian translation finished (for now)
- * changed main theme
- * some minor changed in code (some dialogs were readjusted)
-
-2008-05-23 Reinhold Rumberger <ru...@us...>
- * README: spell & grammar check
- * README.de: startet
-
-2008-05-20 (0.2.14) Andy Rozman <and...@us...>
- * adding log4j support to GGCDb and some other important classes
- * checking log4j configurations
-
-2008-05-21 Reinhold Rumberger <ru...@us...>
- * fixed date display bug in course graph - still looks ugly though
- * GGCLittle now uses the same about-dialog as the rest of ggc
- * translation
- * corrected bug in DailyValues: getDayAndMonthAsString() and getDateAsString()
-
-2008-05-19 Reinhold Rumberger <ru...@us...>
- * Fixed a bug where selecting cancel in "Meals, Foods Selector"
- (or selecting nothing) would cause several NullPointerExceptions
- * translation
-
-2008-05-15 (0.2.13) Andy Rozman <and...@us...>
- * bug fixes to nutrition database gui (should be working, testing is
- underway).
-
-2008-05-14 (0.2.12) Andy Rozman <and...@us...>
- * Implementation of DailyValueEntry adding Food (connecting foods
- databases, with daily entries)
- * some bugs fixed
- * Atech-Tools 0.1.14 needed
-
-2008-05-11 Reinhold Rumberger <ru...@us...>
- * translation
- * changed the statistics to display counts as integers (as there can be no
- such thing as half an injection)
- * fixed division-by-zero in getAvgBG()
- * new bugs
-
-2008-05-08 (0.2.11) Andy Rozman <and...@us...>
- * Changes to database xml files, new version of Internal Db (H2)
- * Db Version Change: Stable: v4, Development: v5
-
-2008-05-03 (0.2.10) Andy Rozman <and...@us...>
- * Startup has gone through big changes, UpdateConfig has changed much
- so now Atech Tools (0.1.13) is needed
- * Started work on Daily Values input for Foods
-
-2008-04-30 (0.2.9.12) Andy Rozman <and...@us...>
- * Backup implementation finished
- * Added some pumps menus (still in planning... don't worry)
-
-2008-04-29 (0.2.9.11) Andy Rozman <and...@us...>
- * Backup implementation 0.1 finished (non-gui backup)
- * Backup implementation 0.2 started (GUI)
- * Daily Values input changed: validation done via JFormattedTextField, added
- values for both types of BG (we had one before, but switching types make
- that impossible). Double click opens edit.
-
-2008-04-24 Reinhold Rumberger <ru...@us...>
- * german translation
-
-2008-04-18 Reinhold Rumberger <ru...@us...>
- * german translation: keywords brought up-to-date
- * GGC_Nutrition initialized
- * slight corrections to english language files
-
-2008-03-22 (0.2.9.10) Andy Rozman <and...@us...>
- * some files were moved to different packages (ggc.core package created), we
- have now more distinct split beetween files for creation of different jars
- From now on, we create 4 jars:
- - ggc-core.jar: contains all classes needed by any GUI
- - ggc-main.jar: contains main GUI (for main application)
- - ggc-little.jar: containing Little GUI (resident version of GGC, that
- can input only data for today)
- - ggc-lang.jar: contains all language files and help files
- * Nutrition and meals functionalities completed
- * language files were split. Now we have main language file and nutrition
- language file, which also contains translation for Nutritions in database
- * changes to ant files (added new libraries, more jars creation and
- versioning of created jars)
- * export of nutrition db done (need to rework whole import/export stuff)
- * work started on connecting nutrition databases to daily values entries
-
-
-2008-03-22 (0.2.9.9) Andy Rozman <and...@us...>
- * see BUGS.txt (some of bugs were fixed)
-
-2008-03-22 (0.2.9.8) Andy Rozman <and...@us...>
- * many changes in atech-tools, added selector, abstract DataAccess and some
- other files. It is now required to use version of atech-tools
- directly from sourceforge (SVN)
- * changed db loading. Partitial loading and menus/toolbar displaying
- * changed database to refect multi person functionality
- * added javahelp framework
- * added help buttons in whole application
- * through whole application icons were added and some code chenged to
- be able to do this
- * meal db added and 80% implemented
- * usda nutrition db fixed (90% done)
- * user nutrition db work started (about 40% done)
-
-2008-03-02 Reinhold Rumberger <ru...@us...>
- * german translation
-
-2008-02-13 Reinhold Rumberger <ru...@us...>
- * added new keys to GGC_de
- * fixed graph display offset bug
-
-2008-02-13 Reinhold Rumberger <ru...@us...>
- * added entries from BUGS.txt marked with [sf] to sourceforge's bugtracker
-
-2008-02-13 (0.2.9.7) Andy Rozman <and...@us...>
- * source code changes to be compilable on java 1.5
- (java 1.5 compatibility must be maintained) !!!!
- * use of atech-tools 0.1.9 required (java 1.5 compatibility issue)
- * implementation of update/startup mechanism started in atech-tools (0.1.9), files
- added to support testing on GGC. Startup will be implemented first, because update
- functionality needs to have server side done, which will take some time.
- * jar files creation will change in near future (instead of two files, we will produce
- 3: ggc, ggc-core and ggc-little). ggc will contains files specific to main gui, while
- core contains all data, db and utill classes. ggc-little contains only GGC Little
- specific code. Change is planned and division has started.
-
-2008-02-08 (0.2.9.6) Andy Rozman <and...@us...>
- * major changed to whole nutrition db and framework
- * final changes to USDA nutrition databases
- * menu changes
- * finalized changes to Printing (added Extended)
- * display plug-ins: meters_tool and pumps tool
-
-
-2008-01-29 (0.2.9.5) Andy Rozman <and...@us...>
- * fixing daily input values
-
-2008-01-02 Reinhold Rumberger <ru...@us...>
- * fix for NumberFormatException when no BG is entered
- * a BG of 0 isn't shown as a value in the table or the dialog anymore
-
-2008-01-21 Reinhold Rumberger <ru...@us...>
- * removed YOUR_CURRENT from GGC_en and GGC_de
- * key "SPREAD_GRAPH" seems to have gone missing
- * some more translation
- * documented some bugs
-
-2008-01-20 (v0.2.9.2 - 0.2.9.4) Andy Rozman <and...@us...>
- * Added code for future versions
- * Import of old DailyValues data (from 0.3 export or MeterTool), just class, no gui
- * fixing of several warnings that Eclipse produced
- * main display changed, instead schedule we now have schedule and stocks.
- * added dialogs for doctors and appointments (visible through developer version)
- * changed code a little, to allow starting GGC in development mode (add any paramter
- to startup class)
- * atech-tools 0.1.8 linked to project
- * meter tool project started (it's in same SVN just in another directory). All changes
- that are relevant to meters (and not directly to GGC main are visible from path
- /ggc-meter). TO-DO file is also changed, all meter specific tasks have been moved
- to ggc-meter project.
- * ant build files changed (GGCBuild.properties_default)
- * nutrition (usdb) db view fixed, nutrition (USDb) is with this change finished
-
-2008-01-20 Reinhold Rumberger <ru...@us...>
- * removed a couple of @Override Tags to make to project compile again
- * sync between GGC_de and GGC_en
- * small correction of slovene that slipped into GGC_en
- * fixed some small problems with graphs display when no data is present
-
-2008-01-13 Reinhold Rumberger <ru...@us...>
- * updated german translation
- * corrected english translation
- * small fix to maintain ability to translate to german
-
-2008-01-12 Reinhold Rumberger <ru...@us...>
- * updated german translation to include new strings (no actual translation yet)
-
-2008-01-06 (v0.2.9.1) Andy Rozman <and...@us...>
- * adding new daily entry changed, some options are still unavailable, but it has totally new look
- * BG data is now written in mg/dl format, user can select on entry in which format he wishes to write
- * about dialog finalized
- * bugs with daily data fixed
- * delete changed
- * added new menus for future functionalities
- * fixed menu's mnemonic display
- * slovenian translation updated
- * meter support removed, at least for any new devices ... meter support will be done through separate
- project, called meter_tool in next release
- * changes to main gui
- * atech-tools 0.1.7 linked to project (about dialog mainly, several component: DateTimeComponent,
- I18nControl moved)
- * build fixed, with support for newer version of libraries (ggc-support updated)
-
-
-
-2006-04-04 Reinhold Rumberger <ru...@us...>
- * updated german translation
-
-2006-04-02 (v0.2.5.3) Andy Rozman <and...@us...>
- * Bug fixes (from BUGS.txt):
- - In Preferences->General: changing language also changes selected L&F name, but not class
- - Changed preferences mostly apply only after restart (names, language)
- - hba1c of 2.09% with ZERO readings...
-
-
-2006-04-01 (v0.2.5.2) Andy Rozman <and...@us...>
- * Fixing reading of configuration
- * Refresh of Info panels fixed
- * Extensive database changes, a lot of added files to ggc.db.hibernate (some of files also removed):
- - added: Doctors (doctor types, doctors, appointments), Stocks (stock type, srock subtype, stocks),
- Nutrition (added global data, changed nutrition from usdb, added user nutrition db, changed
- meals definitions), Meter (meter companies, meters, meter interface (for import), meter
- implementations), Inet stuff (inet group, inet links, ...)
- * Some file rename in ggc.db.datalayer
- * Loading and init of Nutrition database changed
- * Added User Nutrition Database
- * Display USDB Nutrition Database
- * Changed menus: restructuring, added entries: Stocks, Doctors, Appointments, Database Maintainance,
- User Nutrition Database, Meter List (added are items, not functionality).
- * Meter Management will be done in Database. We will try to have database filled with all different
- meters available arround, those that are supported by GGC will have some other entries, so
- that user has overview over most available meters. (so far list has 34 meters, only 3 are supported
- to be read by application, another 7 are in the works (Ascensia) and will be available in 0.4 version
- (End of 2007)
-
-
-2006-03-21 (v0.2.4.2) Reinhold Rumberger <ru...@us...>
- * german translation
- * several bugs in BUGS.txt
- * fixed bug in displaying graphs' y-axis labels
-
-2006-03-13 Reinhold Rumberger <ru...@us...>
- * updated german translation
-
-2006-03-11 (v0.2.4.1) Andy Rozman <and...@us...>
- * Color scheme settings
- * Configuration work finished - probably
-
-2006-03-10 (v0.2.3.1) Andy Rozman <and...@us...>
- * Loading L&F at startup
- * Changing some debug information for Db
-
-2006-03-06 (v0.2.2.10 - 8) Andy Rozman <and...@us...>
- * Configuration save fixed
- * General settings
- o Setting Db
- o Setting Look and Feel (and saving info to configuration file)
-
-2006-01-24 Reinhold Rumberger <ru...@us...>
- * made path to javax.comm.properties in DataAccess system-independant
-
-2006-01-23 (v0.2.2.7) Andy Rozman <and...@us...>
- * New configuration tables are now used (old databases won't work anymore)
- * Fixing of configuration stuff:
- o Meter Configuration fixed
-
-2006-01-21 Reinhold Rumberger <ru...@us...>
- * build.xml: ggc_l might now work again
- * translation
-
-2006-01-05 Reinhold Rumberger <ru...@us...>
- * make run.sh work
-
-2006-01-03 Reinhold Rumberger <ru...@us...>
- * new idea in IDEAS
-
-2006-12-27 (v0.2.2.6) Andy Rozman <and...@us...>
- * DailyRowDialog is replaced with older version, since new version is not working
- yet
- * Added new code for supporting meters
- * Added new dialog for meters
- * Meters support is in early testing phase, old meters code is disabled for now
-
-2006-12-26 Reinhold Rumberger <ru...@us...>
- * GGCDb: - made connection detail fields protected instead of public since other
- packages have no business reading things like password and username
- - used constants for loadStatus to make code more readable and future
- changes easier
-
-2006-12-15 Reinhold Rumberger <ru...@us...>
- * InitDb, NutritionImport: prevent probably buggy code from being reached
- * StatisticInfoPanel: - renamed to StatisticsInfoPanel
- - commented out unnecessary if
- * added @Override were it was necessary
- * removed unnecessary casts
- * DataAccess: replaced calls to deprecated methods
-
-2006-09-07 Reinhold Rumberger <ru...@us...>
- * README: removed first preliminary release target date
- * GGC_de.properties: some more translation
-
-2006-09-05 Reinhold Rumberger <ru...@us...>
- * I18nControl: minor changes to the code
-
-2006-08-09 Reinhold Rumberger <ru...@us...>
- * Added new strings to GGC_de
- * Some general cleanup and java 1.5 niceties
-
-2006-06-09 Reinhold Rumberger <ru...@us...>
- * Added new strings to GGC_de, some translation
- * Some rewording in GGC_en
-
-2006-06-08 (v0.2.2.5) Andy Rozman <and...@us...>
- * Added saving of Rendering settings
-
-2006-05-08 (v0.2.2.4) Andy Rozman <and...@us...>
- * Printing Dialog for selection of month and year which to print
- * Basic installer script, which be used to create deployment file for Windows
- (NSIS). Deployment file for linux will be created at later time (as tar.gz
- image).
- * Printing report internationalized, keywords added to master file (english).
- * Slovenian translation for printing added
- * Fixed problem with Daily graph display in Daily Stats Dialog
-
-2006-05-02 (v0.2.2.3) Andy Rozman <and...@us...>
- * MonthlyValues changed to work for simple PDF reports
- * Create Simple PDF Reports (works with hardcoded values so far)
- we can print only 2006 month 4, and times settings for meals are
- hardcoded. Dialog to select date is not ready and times settings
- must be done in config (in next release).
-
-2006-04-28 (v0.2.2.2) Andy Rozman <and...@us...>
- * Meter handling. There are new files added for meter handling. I plan to add
- support for some of meters in future, and I will change way how to get data.
- Old will be used same way as now, but new ones will use new dialog and new
- interfaces.
- * moved ggc.errors to ggc.data.errors
- * moved ggc.event to ggc.data.event
- * moved ggc.print to ggc.data.print and renamed and added one file (for simple
- and extended printing)
- * moved ggc.nutrition to ggc.gui.nutrition
-
-
-2006-04-27 (v0.2.2.1) Andy Rozman <and...@us...>
- * moved ggc.datamodels to ggc.data
- * moved GGCDb and GGCDbLoader to ggc.db (from ggc.db.datalayer)
- * changes to configuration (Colors)
- * start working on printing (added PrintingDialog, MonthlyValues)
- * looking at meter import tool, trying to fix all exception that are thrown
- if no meter present
-
-2006-04-26 Reinhold Rumberger <ru...@us...>
- * README: some spellchecking and rewording
-
-2006-04-25 (v0.2.1.13) Andy Rozman <and...@us...>
- * Removal of DatabaseHandler and HibernateHandler. All classes were changed to
- use Db directly trhorugh DataAccess static class
- * Fixing of GGCLittle to use new database schema (Hibernate)
- * Visual changes to GGCLittle
- * Fixed add, editing, deleting and graph display, from functional point of view
- GGCLittle is working, but from visual point of view, there is still work to
- do (about, meter import, add/edit should be centered).
-
-2006-04-23 Andy Rozman <and...@us...>
- * update of slovene language file
- * some of translation done
-
-2006-04-23 Reinhold Rumberger <ru...@us...>
- * GGC_de.properties:
- - merged in changes from GGC_en.properties
- - sorted in alphabetical order
- * moved ggcl.jar form the build directory to the binary directory in ant build task "jar_l"
- * more translation...
- * GGC_en.properties: removed superfluous "MEALS"
-
-2006-04-19 Andy Rozman <and...@us...>
- * changes to README file
- * added two tasks into ant: style_devel, style_deploy, which are used for
- style checks (checkstyle-all-4.1.jar needed in lib/devel)
- * fixed a lot of code so that is conformant with programming style guide
- * updated ggc_db_nutr.zip and test_nutrition.zip with new versions of database
- and config files, so that they now also contain config (which is almost finished)
-
-2006-04-18 (v0.2.1.12) Andy Rozman <and...@us...>
- * Color schemes changed, we reference colorscheme by name and not by id.
-
-2006-04-15 Reinhold Rumberger <ru...@us...>
- * had to merge in some conflicts in DataAccess.java; hope I made no mistakes.
- It compiles so I can't have broken too much...
- * GGC_de.properties: merged in changes from GGC_en.properties
- * added NO_DATABASE_FOUND to GGC_en.properties
- * README: changed "CVS" to "SVN"
- * added run.sh, the bash equivalent of run.cmd -- Note: some classpaths seem to be missing
-
-2006-04-15 (v0.2.1.11) Andy Rozman <and...@us...>
- * fixed Statistics (BG / Insulin) and Hba1c display
- * fixed AbstractGraphView problem
- * fixed display of daily graphs in day stats
- * fixed control panels of daily graph (date selector was displayed very ugly, and
- all texts for check and select elements were displayed to close to control
-
-2006-04-14 (v0.2.1.10) Andy Rozman <and...@us...>
- * moved ggc.gui.PropertiesFrame to ggc.gui.cfg.PropertiesDialog, and changed internal
- workings, so that after properties are done, we can save all setting and not just the
- current as it was till now.
- * changed DailyStatsDialog to display graph and ti display error if no row was selected.
- * fixed AbstractGraphView
- * added methods for set to GGCProperties (for insulins, bg's and general data)
- * PropertiesDialog fixed save/apply and cancel
- * medical data added new configuration stuff (bg unit, settings for both bg units) and
- fixed saving
-
-2006-04-13 (v0.2.1.9) Andy Rozman <and...@us...>
- * continuing work on config in db
- * loading of selected language (from config file)
- * general setting of properties are working
-
-2006-04-11 (v0.2.1.8) Andy Rozman <and...@us...>
- * added I18nCheck tool to help translators by translation (they display keywords
- not available in language file)
- * started removing config file. All settings will be stored in database, except database
- settings and language settings
- * changed GGCProperties, and changed all callings of this class to DataAccess where
- GGCProperties is instantiated.
-
-2006-04-10 (v0.2.1.7) Andy Rozman <and...@us...>
- * moved ggc.view.* to ggc.gui.view.*
- * Renamed and made as JDialog: CourseGraphFrame, DailyGraphFrame, FrequenceGraphFrame,
- SpreadGraphFrame, and fixed.
-
-2006-04-10 (v0.2.1.6) Andy Rozman <and...@us...>
- * Some bug fixes in Graphs. Now graphs are displayed. This code is not finished
- yet, but it's now usable without getting any exceptions.
- * Configuration of meters now displays meters correctly
- * Added Time calculation methods in DataAccess (we got wrong time as
- GregorianCalendar and database returned nothing).
-
-2006-04-10 Reinhold Rumberger <ru...@us...>
- * new function getDisplayedBG() in DataAccess, not used yet
-
-2006-04-08 Reinhold Rumberger <ru...@us...>
- * started changing AbstractGraphView to make selection of BG unit type possible
- * added unit to BG axis in DailyGraphView, couldn't do others as I can't access them
- * DataAccess: "public static void" inf field should've been "public static final"
- * corrected html in GGC_en.properties and added articles
- * some more translation in GGC_de.properties
- * ggc.little.DailyStatsPanel: made changes neccessary due to the deletion of AddRowFrame
- * added inherited abstract methods to DummyHandler, they return empty objects
- * MainFrame: made version info final, major formatting changes, as my tab width (4 spaces)
- and the obviously used tab width (8 spaces) just didn't mix
- * changes ...
[truncated message content] |
|
From: <and...@us...> - 2016-12-25 18:18:35
|
Revision: 1439
http://sourceforge.net/p/ggc/code/1439
Author: andyrozman
Date: 2016-12-25 18:18:32 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
GGC Desktop
- move files
Modified Paths:
--------------
trunk/ggc-desktop-app/ggc-desktop/pom.xml
trunk/ggc-desktop-app/pom.xml
Added Paths:
-----------
trunk/ggc-desktop-app/ggc-desktop-little/
trunk/ggc-desktop-app/ggc-desktop-little/docs/
trunk/ggc-desktop-app/ggc-desktop-little/pom.xml
trunk/ggc-desktop-app/ggc-desktop-little/src/
trunk/ggc-desktop-app/ggc-desktop-little/src/main/
trunk/ggc-desktop-app/ggc-desktop-little/src/main/java/
trunk/ggc-desktop-app/ggc-desktop-little/src/main/resources/
trunk/ggc-desktop-app/ggc-desktop-little/src/test/
trunk/ggc-desktop-app/ggc-desktop-little/src/test/java/
trunk/ggc-desktop-app/ggc-desktop-little/src/test/resources/
Removed Paths:
-------------
trunk/ggc-desktop/
Modified: trunk/ggc-desktop-app/ggc-desktop/pom.xml
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/pom.xml 2016-12-25 18:04:29 UTC (rev 1438)
+++ trunk/ggc-desktop-app/ggc-desktop/pom.xml 2016-12-25 18:18:32 UTC (rev 1439)
@@ -4,40 +4,17 @@
<parent>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath>
+ <artifactId>ggc-desktop-app</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <name>GGC Desktop Project</name>
-
+ <name>GGC Desktop - Desktop</name>
<artifactId>ggc-desktop</artifactId>
<version>${ggc-desktop.version}</version>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
+
<dependencies>
<dependency>
<groupId>com.atech-software</groupId>
Added: trunk/ggc-desktop-app/ggc-desktop-little/pom.xml
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop-little/pom.xml (rev 0)
+++ trunk/ggc-desktop-app/ggc-desktop-little/pom.xml 2016-12-25 18:18:32 UTC (rev 1439)
@@ -0,0 +1,81 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-desktop-app</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>GGC Desktop - Little</name>
+ <description>GGC Little (Version of GGC that could always run in background)</description>
+ <artifactId>ggc-desktop-little</artifactId>
+ <version>0.1-SNAPSHOT</version>
+
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <!-- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory> -->
+
+
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-desktop</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.atech-software</groupId>
+ <artifactId>atech-tools</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.4-702.jdbc3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <!-- <version>4.11</version> -->
+ <!-- <scope>test</scope> -->
+ </dependency>
+
+
+ </dependencies>
+
+ <properties>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ </properties>
+
+</project>
Modified: trunk/ggc-desktop-app/pom.xml
===================================================================
--- trunk/ggc-desktop-app/pom.xml 2016-12-25 18:04:29 UTC (rev 1438)
+++ trunk/ggc-desktop-app/pom.xml 2016-12-25 18:18:32 UTC (rev 1439)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>GGC Desktop App</name>
+ <name>GGC Desktop</name>
<artifactId>ggc-desktop-app</artifactId>
<packaging>pom</packaging>
@@ -21,6 +21,7 @@
<modules>
<module>ggc-desktop</module>
+ <module>ggc-desktop-little</module>
</modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 19:22:57
|
Revision: 1442
http://sourceforge.net/p/ggc/code/1442
Author: andyrozman
Date: 2016-12-25 19:22:53 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc-nutrition
- first check afer move
Modified Paths:
--------------
trunk/ggc-plugins/pom.xml
Added Paths:
-----------
trunk/ggc-plugins/ggc-nutrition/.settings/
trunk/ggc-plugins/ggc-nutrition/build/
trunk/ggc-plugins/ggc-nutrition/build/build.xml
trunk/ggc-plugins/ggc-nutrition/docs/
trunk/ggc-plugins/ggc-nutrition/docs/Changelog
trunk/ggc-plugins/ggc-nutrition/pom.xml
trunk/ggc-plugins/ggc-nutrition/src/main/resources/GGC_Nutrition_de.properties
trunk/ggc-plugins/ggc-nutrition/src/main/resources/GGC_Nutrition_en.properties
trunk/ggc-plugins/ggc-nutrition/src/main/resources/GGC_Nutrition_fr.properties
trunk/ggc-plugins/ggc-nutrition/src/main/resources/GGC_Nutrition_si.properties
trunk/ggc-plugins/ggc-nutrition/src/main/resources/icons/
Removed Paths:
-------------
trunk/ggc-nutri/.settings/
trunk/ggc-nutri/build/
trunk/ggc-nutri/docs/
trunk/ggc-nutri/pom.xml
trunk/ggc-nutri/src/GGC_Nutrition_de.properties
trunk/ggc-nutri/src/GGC_Nutrition_en.properties
trunk/ggc-nutri/src/GGC_Nutrition_fr.properties
trunk/ggc-nutri/src/GGC_Nutrition_si.properties
trunk/ggc-nutri/src/ggc/
trunk/ggc-nutri/src/icons/
trunk/ggc-plugins/ggc-nutrition/build/build.xml
trunk/ggc-plugins/ggc-nutrition/docs/Changelog
Deleted: trunk/ggc-nutri/pom.xml
===================================================================
--- trunk/ggc-nutri/pom.xml 2016-12-25 18:55:50 UTC (rev 1441)
+++ trunk/ggc-nutri/pom.xml 2016-12-25 19:22:53 UTC (rev 1442)
@@ -1,64 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath>
- </parent>
-
- <name>GGC Nutrition Tool Project</name>
-
- <artifactId>ggc-nutri-tool</artifactId>
- <version>${ggc-nutri-tool.version}</version>
-
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- </dependency>
- </dependencies>
-
- <properties>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- </properties>
-
-</project>
Deleted: trunk/ggc-nutri/src/GGC_Nutrition_de.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_de.properties 2016-12-25 18:55:50 UTC (rev 1441)
+++ trunk/ggc-nutri/src/GGC_Nutrition_de.properties 2016-12-25 19:22:53 UTC (rev 1442)
@@ -1,507 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 1.3.1 ###
-# ### Last change: 03.07.2011 14:12:02 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 418
-# Not translated: 215 (51 %)
-# Need to be checked: 21 (5 %)
-#
-# Translated: 182 (43 %)
-#
-#
-#
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# Global [1]
-#
-DELETE=L\u00F6schen
-ADD=Hinzuf\u00FCgen
-EDIT=Bearbeiten
-NEW=Neu
-INFORMATION=Information
-QUESTION=Frage
-YES=Ja
-NO=Nein
-OK=OK
-CANCEL=Abbrechen
-APPLY=Anwenden
-SELECT=W\u00E4hlen
-HELP=Hilfe
-ROOT=root
-
-#
-# Global Dialogs [1]
-#
-SELECT_ITEM_FIRST=W\u00E4hlen Sie bitte erst einen Eintrag und danach eine Aktion!
-ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich l\u00F6schen?
-TRANSLATED_NAME=\u00DCbersetzter Name (falls verf\u00FCgbar)
-ID=ID
-USDA_NUTRITION_DATABASE=N\u00E4hrstoff-Datenbank des USDA
-USER_NUTRITION_DATABASE=N\u00E4hrstoff-Datenbank des Benutzers
-USDA_NUTRITION_DATABASE_DESC=<html><body>Die USDA-DB ist die United States Department of Agriculture Datenbank, die viele in den USA erhältiche Lebensmittel enthält. Da diese Datenbank in der ganzen Welt genutzt wird, haben wir uns entschieden sie zu integrieren. Die Version, die sich in der Datenbank befindet, hängt von den Dateien ab, die importiert wurden. Erlaubt sind Versionen 18 und höher (getestet wurde SR-18).<br>In diesem Modul werden alle Einträge der Datenbank angezeigt und wenn es von bestimmten anderen Modulen (wie z.B. dem Mahlzeiten-Modul) aus aufgerufen wurde, können Lebensmittel zum Importieren ausgewählt werden.</body></html>
-USER_NUTRITION_DATABASE_DESC=<html><body>Dies ist die Nährstoff-Datenbank, zu der der Benutzer selbst Einträge hinzufügen kann. In Zukunft wird der Import fremder Nährstoff-Datenbanken unterstützt werden (die dann editierbar sein werden), damit Sie die Vorteile der erweiterten Ordnerstruktur (Ordner können Unterordner enthalten) genießen können. Wenn Sie beispielsweise in Deutschland wohnen, könnten Sie einen Ordner namens "Deutsche Nahrung" anlegen, in den Sie dann unterschiedliche Gruppen (z.B. "Zubereitung: Mikrowelle"), Nahrungstypen, usw. eintragen könnten.</body></html>
-USDA_NUTRITION_DB=USDA N\u00E4hrstoff-DB
-USER_NUTRITION_DB=Benutzer N\u00E4hrstoff-DB
-MEALS_DB=Mahlzeiten-DB
-NONE=Nichts
-NUTRITION=N\u00E4hrstoff
-AMOUNT_LBL=Menge
-
-#
-# Menus [0]
-#
-
-# main menus
-MN_FOOD=&Nahrungsmittel
-MN_NUTRDB_USDB=Nahrungsmittel-DB (USDA)
-MN_NUTRDB_USDB_DESC=Nahrungsmittel-Datenbank des USDA
-MN_NUTRDB_USER=Nahrungsmittel-DB (Benutzer)
-MN_NUTRDB_USER_DESC=Nahrungsmittel-Datenbank des Benutzers
-MN_MEALS=Mahlzeiten-DB
-MN_MEALS_DESC=Datenbank mit Mahlzeiten
-MN_FOODMENU=N&ahrungsmen\u00FC
-MN_FOODMENU_DESC=Reports for Food Menus
-MN_FOODMENU_SIMPLE=Einfach (nur KH)
-MN_FOODMENU_SIMPLE_DESC=Printing food menu (Simple)
-MN_FOODMENU_EXT1=Erweitert I (KH, Ins.)
-MN_FOODMENU_EXT1_DESC=Printing food menu (Extended - CH,Ins)
-MN_FOODMENU_EXT2=Erweitert II (KH, Ins., BZ)
-MN_FOODMENU_EXT2_DESC=Printing food menu (Extended - CH,Ins,BG)
-MN_FOODMENU_EXT3=Extended III (CH,Ins,BG,kJ)
-MN_FOODMENU_EXT3_DESC=Printing food menu (Extended - CH,Ins,BG,kJ)
-
-#
-# Popup Menu [1]
-#
-PM_NUT_VIEW=Anzeigen
-PM_NUT_CLOSE=Schlie\u00DFen
-PM_NUT_EDIT_GROUP=Gruppe bearbeiten
-PM_NUT_ADD_GROUP=Gruppe hinzuf\u00FCgen
-PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzuf\u00FCgen
-PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten
-PM_NUT_ADD_MEAL=Mahlzeit hinzuf\u00FCgen
-PM_NUT_EDIT_MEAL=Mahlzeit bearbeiten
-
-#
-# Backup Objects [1]
-#
-NUTRITION_OBJECTS=Nahrungsobjekte
-USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
-MEAL_GROUPS=Mahlzeitengruppen
-MEALS=Mahlzeiten
-FOODS=Ern\u00E4hrung
-
-#
-# Food [1]
-#
-NEW_FOOD=Neues Lebensmittel
-ADD_FOOD=Neues Lebensmittel hinzuf\u00FCgen
-FOOD_GROUP=Lebensmittelgruppe
-GROUP_NAME=Gruppenname
-FOOD_NAME=Name des Lebensmittels
-REFUSE_LBL=Ungenie\u00DFbarer Anteil
-NUTRITIONS_FOOD=N\u00E4hrstoffe
-FOOD_DESCRIPTION=Lebensmittel-Beschreibung
-HOME_WEIGHTS=Home weights (if defined)
-WEIGHT_TYPE=Weight Type
-AMOUNT_WEIGHT=Menge & Gewicht
-WEIGHT=Gewicht (in g)
-UNITS=Einheiten
-FOOD_GROUPS=Lebensmittelgruppen
-MEAL_GROUP=Mahlzeitengruppe
-SELECTED_GROUP=Gew\u00E4hlte Gruppe
-SELECT_GROUP=Gruppe w\u00E4hlen
-PARENT_GROUP=\u00DCbergeordnete Gruppe
-EDIT_MEAL_GROUP=Mahlzeitengruppe bearbeiten
-ADD_MEAL_GROUP=Neue Mahlzeitengruppe hinzuf\u00FCgen
-NEW_GROUP=Neue Gruppe
-TRANSLATION_KEYWORD=Schl\u00FCsselwort f\u00FCr die \u00DCbersetzung
-WISH_TO_SAVE_NEW_GROUP=Sie haben eine neue Gruppe erstellt. Wollen Sie speichern?
-WISH_TO_SAVE_EDITED_GROUP=Sie haben eine Gruppe ge\u00E4ndert. Wollen Sie speichern?
-ADD_FOOD_GROUP=Lebensmittelgruppe hinzuf\u00FCgen
-EDIT_FOOD_GROUP=Lebensmittelgruppe bearbeiten
-
-#
-# Meal [1]
-#
-NUTRITION_TYPE=N\u00E4hrstofftyp
-SELECTED_ITEM=gew\u00E4hltes Element
-NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
-SELECTOR=Selector
-USDA_NUTRITION=USDA N\u00E4hrstoff
-USER_NUTRITION=Benutzerdefinierte N\u00E4hrstoff
-MEAL=Mahlzeit
-SELECT_ITEM=Element w\u00E4hlen
-MEALS_FOODS_SELECTOR=Mahlzeiten- und Lebensmittelwahl
-MEAL_ADD=Mahlzeit hinzuf\u00FCgen
-MEAL_EDIT=Mahlzeit bearbeiten
-MEAL_NAME=Mahlzeitname
-AVAILABLE_NUTRITIONS=Verf\u00FCgbahre N\u00E4hrstoffe
-FOODS_MEALS_NUTRITIONS=Lebensmittel, Mahlzeiten und/oder N\u00E4hrstoffe
-MEAL_FOOD_ADD_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe hinzuf\u00FCgen
-MEAL_FOOD_EDIT_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe bearbeiten
-MEAL_FOOD_DELETE_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe l\u00F6schen
-MEAL_TYPE=Typ
-DESCRIPTION=Beschreibung
-TRANSLATION_KEYWORD_MEAL=Schl\u00FCsselwort f\u00FCr die \u00DCbersetzung
-TRANSLATED_NAME_MEAL=\u00DCbersetzter Name
-GROUP=Gruppe
-WISH_TO_SAVE_NEW_MEAL=Sie haben eine neue Mahlzeit erstellt. Wollen Sie speichern?
-WISH_TO_SAVE_EDITED_MEAL=Sie haben eine Mahlzeit ge\u00E4ndert. Wollen Sie speichen?
-NEW_MEAL=Neue Mahlzeit
-CANT_SELECT_CIRCULAR_MEAL=Die Mahlzeit, die bearbeitet wird, kann nicht hinzugef\u00FCgt werden
-CANT_SELECT_CHILD_OR_GROUP=Diese Gruppe oder ein Kindelement dieser Gruppe kann nicht als Elternelement dieser Gruppe gew\u00E4hlt werden!
-MEAL_VIEW=Meal View
-MEALS_DATABASE=Mahlzeiten-Datenbank
-MEALS_DATABASE_DESC=<html><body>Die Mahlzeiten-Datenbank enth\u00E4lt komplette Gerichte, z.B. "McDonald's Big Mac Men\u00FC". Sie enth\u00E4lt einige Elemente der USDA-Datenbank, z.B. "Big Mac Hamburger" und "Coca-Cola".<br>Gerichte k\u00F6nnen Elemente aus allen Datenbanken enthalten.</body></html>
-ADD_MEAL=Mahlzeit hinzuf\u00FCgen
-
-#
-# Food (User) [1]
-#
-FOOD_EDIT=Lebensmittel bearbeiten
-SELECTED_NUTRITION=gew\u00E4hlter N\u00E4hrstoff
-SELECT_NUTRITION=N\u00E4hrstoff w\u00E4hlen
-SELECTED_HOME_WEIGHT=Selected Home Weight
-SELECT_HOME_WEIGHT=Select Home Weight
-NEW_NUTR_DEF=Neu
-WEIGHT_UNIT=Gew. Einheit
-TAG=Tag
-SELECTOR_NUTRITION_DEFINITION=Selector for Nutritions
-NUTRITION_NAME=N\u00E4hrstoffname
-NUTRITION_SELECTOR=Nutritions Selector
-HOME_WEIGHT_SELECTOR=Home Weight Selector
-WISH_TO_SAVE_NEW_FOOD=Sie haben ein neues Lebensmittel eingetragen. Wollen Sie speichern?
-WISH_TO_SAVE_EDITED_FOOD=Sie haben die Lebensmitteldaten ge\u00E4ndert. Wollen Sie speichern?
-NUTRITIONS=N\u00E4hrstoffe
-SELECTOR_HOME_WEIGHT=Selector for Home Weights
-NEW_HOME_WEIGHT=Neu
-HOME_WEIGHT_NAME=Home Weight Name
-USER_DEFINED=Benutzerdefiniert
-HOME_WEIGHT_ADD_DESC=Add Home Weight
-HOME_WEIGHT_EDIT_DESC=Edit Home Weight
-HOME_WEIGHT_DELETE_DESC=Delete Home Weight
-
-#
-# Daily Values and Foods [1]
-#
-WEIGHT_LBL2=Gewicht
-HOME_WEIGHTS_LBL=Home Weights
-WGHT_PER_AMOUNT=Gewicht/Menge
-WEIGHT_SHORT=Gew.
-
-#
-# Selector for Daily Value [1]
-#
-MEALS_FOODS_SELECTOR_DAILY=Mahlzeiten- und Lebensmittelwahl f\u00FCr den Eintrag
-NAME=Name
-HOME_WEIGHT=Home Weight
-NO_ITEM_SELECTED=Keine Auswahl.
-
-#
-# Printing Food menu [2]
-#
-PRINT_FOOD_DESC=Food Description
-DATE=Date
-TIME=Time
-FOOD_MENU_BASE=Food Menu Base (CH only)
-FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
-FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
-FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
-REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
-TOGETHER=Together
-CH=CH
-INS=Ins
-BG=BG
-AMOUNT_SHORT=Am.
-
-#
-# Nutrients [3]
-#
-PROCNT=Eiwei\u00DF
-FAT=Lipide Gesamt (Fett)
-CHOCDF=Carbohydrate, by difference
-ASH=Asche
-ENERC_KCAL=Energie (kcal)
-STARCH=St\u00E4rke
-SUCS=R\u00FCbenzucker
-GLUS=Glukose (Dextrose)
-FRUS=Fruchtzucker
-LACS=Laktose
-MALS=Maltose
-ALC=Alkohol, \u00C4thyl
-WATER=Wasser
-CAFFN=Koffein
-GI=Glyk\u00E4mischer Index
-GL=Glycemic Load
-GI_MIN=Glyk\u00E4mischer Index (Min)
-GI_MAX=Glyk\u00E4mischer Index (Max)
-GL_MIN=Glycemic Load (Min)
-GL_MAX=Glycemic Load (Max)
-ENERC_KJ=Energie
-SUGAR=Sugars, total
-GALS=Galactose
-FIBTG=Fiber, total dietary
-CA=Kalzium, Ca
-FE=Eisen, Fe
-MG=Magnesium, Mg
-P=Phosphor, P
-K=Kalium, K
-NA=Natrium, Na
-ZN=Zink, Zn
-CU=Kupfer, Cu
-FLD=Fluorid, F
-MN=Mangan, Mn
-SE=Selen, Se
-VITA_IU=Vitamin A, IU
-VITA_RAE=Vitamin A, RAE
-CARTB=Karotin, beta
-CARTA=Karotin, alpha
-TOCPHA=Vitamin E (alpha-tocopherol)
-VITD-=Vitamin D
-VITB6A=Vitamin B6
-VITB12=Vitamin B12
-VITK=Vitamin K (phylloquinone)
-FAMS=Fetts\u00E4uren, einfach ges\u00E4ttigt
-FAPU=Fetts\u00E4uren, mehrfach ges\u00E4ttigt
-CHOLE=Cholesterin
-FATRN=Fatty acids, total trans
-FASAT=Fetts\u00E4uren, ges\u00E4ttigt
-FATRNM=Fatty acids, total trans-monoenoic
-FATRNP=Fatty acids, total trans-polyenoic
-
-#
-# Nutrients, not usually used [3]
-#
-FOL=Folate, total
-CHOLN=Choline, total
-THEBRN=Theobromine
-RETOL=Retinol
-CRYPX=Cryptoxanthin, beta
-LYCPN=Lycopene
-LUT+ZEA=Lutein + zeaxanthin
-TOCPHB=Tocopherol, beta
-TOCPHG=Tocopherol, gamma
-TOCPHD=Tocopherol, delta
-VITC=Vitamin C, total ascorbic acid
-THIA=Vitamin B1, Thiamin
-RIBF=Vitamin B2, Riboflavin
-NIA=Niacin
-PANTAC=Pantothenic acid
-FOLAC=Fols\u00E4ure
-FOLFD=Folate, food
-FOLDFE=Folate, DFE
-BETN=Betaine
-TRP_G=Tryptophan
-THR_G=Threonin
-ILE_G=Isoleucine
-LEU_G=Leucin
-LYS_G=Lysine
-MET_G=Methionin
-CYS_G=Cystine
-PHE_G=Phenylalanin
-TYR_G=Tyrosin
-VAL_G=Valin
-ARG_G=Arginin
-HISTN_G=Histidine
-ALA_G=Alanin
-ASP_G=Asparagins\u00E4ure
-GLU_G=Glutamic acid
-GLY_G=Glycine
-PRO_G=Prolin
-SER_G=Serin
-HYP=Hydroxyproline
-PHYSTR=Phytosterols
-STID7=Stigmasterol
-CAMD5=Campesterol
-SITSTR=Beta-sitosterol
-
-#
-# Home Weights - Translation [2]
-#
--TO-SERVE=to serve
-AFTER=after
-APPROX=approx
-AMOUNT=amount
-AVG.=avg.
-BLOCK=block
-BLOCKS=blocks
-BONE=Knochen
-BONELESS=boneless
-BOTTLE=Flasche
-BAG=bag
-BAR=bar
-BIG=big
-BOX=box
-CAN=Dose
-CHOPPED=chopped
-CHUNK=chunk
-CHUNKS=chunks
-CONTAINER=container
-CONTENTS=contents
-COOKED=gekocht
-COOKIE=cookie
-COOK=cook
-COOKING=cooking
-CRUMBLED=crumbled
-CRUSHED=crushed
-CUBED=gew\u00FCrfelt
-CUBIC=kubisch
-CUT=cut
-CUBE=W\u00FCrfel
-CUBES=W\u00FCrfel
-CUP=Tasse
-CUPCAKE=cupcake
-CUPS=cups
-CURD=curd
-DICED=diced
-DASH=dash
-DRAINED=drained
-DIA=Diameter
-DIA.=Diameter
-DIAM=Diameter
-DIAM.=Diameter
-DIAMETER=Diameter
-ENVELOPE=envelope
-EXTRA=extra
-FOR=for
-FROM=from
-FROZEN=frozen
-FRUIT=fruit
-FRUITS=fruits
-FL=fl
-FLUID=fluid
-GROUND=ground
-G=g
-HIGH=high
-IN=in
-IN.=in.
-INCH=inch
-INSTANT=instant
-ITEM=item
-ITEMS=items
-INDIVIDUAL=individual
-JAR=jar
-JUMBO=jumbo
-LARGE=large
-LEAVES=Bl\u00E4tter
-LONG=lang
-LB=lb
-MAKE=make
-MASHED=mashed
-MAKES=makes
-MEDIUM=medium
-MEAT=meat
-ML=ml
-MELTED=melted
-NOT=nicht
-NET=net
-OUNCE=ounce
-OZ=oz
-OZ.=oz.
-OR=oder
-PACK=pack
-PACKAGE=package
-PACKET=packet
-PACKAGES=packages
-PACKED=packed
-PAT=pat
-PATTY=patty
-PIECE=piece
-PIECES=pieces
-PKG.=pkg.
-POD=pod
-PODS=pods
-PORTION=portion
-POWDER=powder
-PRODUCT=product
-PREPARED=prepared
-QUART=quart
-RAW=raw
-READY=ready
-READY-TO=ready to
-READY-TO-COOK=ready to cook
-READY-TO-EAT=ready to eat
-READY-TO-SERVE=ready to serve
-RECIPE=recipe
-RECONSTITUTED=reconstituted
-REFRIGATED=refrigirated
-REFRIGERATED=refrigerated
-REFUSE=refuse
-REGULAR=regular
-REMOVED=removed
-ROLL=roll
-ROLLS=rolls
-SCOOP=scoop
-SERVING=serving
-SERVINGS=servings
-SHREDDED=shredded
-SHELLED=shelled
-SIFTED=sifted
-SIZE=size
-SMALL=klein
-SMALLER=smaller
-SKIN=skin
-SLICE=slice
-SLICED=sliced
-SLICES=slices
-SNACK=snack
-SNACK-SIZE=snack size
-SQ=sq
-SPRIG=sprig
-SPRIGS=sprigs
-SPOON=L\u00F6ffel
-STICK=stick
-STICKS=sticks
-TABLESPOON=table spoon
-TBSP=table spoon
-TBS=table spoon
-TEASPOON=Teel\u00F6ffel
-TO=zu
-TSP=tea spoon
-THAWED=getaut
-THICK=thick
-THIN=d\u00FCnn
-THICK.=thick.
-UNIT=unit
-UNPACKED=unpacked
-UNPEELED=unpeeled
-UNPREPARED=unprepared
-UNSIFTED=unsifted
-UNTHAWED=unthawed
-UNDILUTED=undiluted
-UNDRAINED=undrained
-UNHEATED=unheated
-WHOLE=whole
-WITH=mit
-WITHOUT=ohne
-WRAPPED=wrapped
-WEDGE=wedge
-WEDGES=wedges
-WHIPPED=geschlagen
-YIELD=yield
-YIELDS=yields
-X=x
-
-#
-# Food translations [3]
-#
-MILK=Milch
-EGG=Ei
-STEAK=Steak
-HEADS=K\u00F6pfe
Deleted: trunk/ggc-nutri/src/GGC_Nutrition_en.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_en.properties 2016-12-25 18:55:50 UTC (rev 1441)
+++ trunk/ggc-nutri/src/GGC_Nutrition_en.properties 2016-12-25 19:22:53 UTC (rev 1442)
@@ -1,556 +0,0 @@
-#
-# !MASTER_FILE!
-# !S! MODULE=GGC - Nutrition Tool
-# !S! MODULE_VERSION=1.3.1
-#
-# ######################################################################
-# ### GNU Gluco Control - Nutrition File ###
-# ######################################################################
-# ### Language: English ###
-# ### Created by: Andy Rozman (an...@tr...) ###
-# ### Last change: 4th June 2011 ###
-# ### Application Version: 1.3.1 ###
-# ### Application Version: 0.5 ###
-# ######################################################################
-#
-# Please use this file as default language file. Do not try to translate
-# from any other files, since this is the Master language file. Create the
-# same header and specify application version number for easier changes at
-# later time.
-# Translations should be grouped by groups as specified here.
-# Older groups are done by packages, newer by logical name.
-#
-# This part is intended for nutrition only, everything that is done
-# by nutrition is here.
-#
-# In data folder there is nutrition folder containg all untranslated words
-# for both: home weights and foods. If we want to achieve full translation
-# of nutrition database, then we need to translate all words. This will be
-# done with time, but it's not priority at this time. So far most common [TODO]
-#
-# 383
-#
-# In brackets there are now tags which define urgency of some text beeing translated
-# !S! GROUP_PRIORITY_1=Needed, urgent (dialogs)
-# !S! GROUP_PRIORITY_2=Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
-# !S! GROUP_PRIORITY_3=Not so important, but nice to have
-#
-
-
-
-#
-# !G! Global [1]
-#
-DELETE=Delete
-ADD=Add
-EDIT=Edit
-NEW=New
-INFORMATION=Information
-QUESTION=Question
-YES=Yes
-NO=No
-OK=OK
-CANCEL=Cancel
-APPLY=Apply
-SELECT=Select
-HELP=Help
-ROOT=Root
-
-#
-# !G! Global Dialogs [1]
-#
-SELECT_ITEM_FIRST=Select item first, before clicking on action!
-ARE_YOU_SURE_DELETE=Are you sure you want to delete this item?
-TRANSLATED_NAME=Translated name (if available)
-ID=Id
-USDA_NUTRITION_DATABASE=USDA Nutrition Database
-USER_NUTRITION_DATABASE=User Nutrition Database
-USDA_NUTRITION_DATABASE_DESC=<html><body>The USDA is the United States Department of Agriculture database containing lots of food used and sold in the US. Since this database is used all around the world, we decided to incorporate it here for the user to use. The version in the database is dependent on the files that were used for import. Versions 18 and higher are allowed (tested with SR-18).<br>In this module you can see all entries of this database, and if you started it from certain other modules (like Meals) you can select food and import them.</body></html>
-USER_NUTRITION_DATABASE_DESC=<html><body>This is the nutrition database which the user can add entries to. At a later time we will support the import of foreign nutrition databases (which will then be editable), so you may take advantage of the extended folder structure (each folder can have subfolders). If, for example, you are from Germany, you can create a folder named "German Foods", in which you then put differnt groups (e.g. Microwave ready, types of foods, manufacturer, etc).</body></html>
-USDA_NUTRITION_DB=USDA Nutrition Db
-USER_NUTRITION_DB=User Nutrition Db
-MEALS_DB=Meals Db
-NONE=None
-NUTRITION=Nutrient
-AMOUNT_LBL=Amount
-
-#
-# !G! Menus
-#
-
-# !SG! main menus
-MN_FOOD=F&ood
-
-MN_NUTRDB_USDB=Nutrition DB (USDA)
-MN_NUTRDB_USDB_DESC=Database of Nutrition data from USDA
-MN_NUTRDB_USER=Nutrition DB (User)
-MN_NUTRDB_USER_DESC=Database of Nutrition data from the user
-MN_MEALS=Meals DB
-MN_MEALS_DESC=Database of Meals
-
-MN_FOODMENU=&Food
-MN_FOODMENU_DESC=Reports for Food Menus
-MN_FOODMENU_SIMPLE=Simple Food Menu (CH only)
-MN_FOODMENU_SIMPLE_DESC=Printing Simple Food Menu (only CH)
-MN_FOODMENU_EXT1=Extended Food Menu I (CH,Ins)
-MN_FOODMENU_EXT1_DESC=Printing Extended Food Menu (CH and Insulin)
-MN_FOODMENU_EXT2=Extended Food Menu II (CH,Ins,BG)
-MN_FOODMENU_EXT2_DESC=Printing Extended Food Menu (CH,Ins,BG)
-MN_FOODMENU_EXT3=Extended Food Menu III (CH,Ins,BG,kJ)
-MN_FOODMENU_EXT3_DESC=Printing Extended Food Menu (CH,Ins,BG,kJ)
-
-
-
-#
-# !G! Popup Menu [1]
-#
-PM_NUT_VIEW=View
-PM_NUT_CLOSE=Close
-PM_NUT_EDIT_GROUP=Edit Group
-PM_NUT_ADD_GROUP=Add Group
-PM_NUT_ADD_FOOD_DESCRIPTION=Add Food Description
-PM_NUT_EDIT_FOOD_DESCRIPTION=Edit Food Description
-PM_NUT_ADD_MEAL=Add Meal
-PM_NUT_EDIT_MEAL=Edit Meal
-
-#
-# !G! Backup Objects [1]
-#
-NUTRITION_OBJECTS=Nutrition Objects
-USER_FOOD_GROUPS=User Food Groups
-MEAL_GROUPS=Meal Groups
-MEALS=Meals
-FOODS=Foods
-
-
-#
-# !G! Food [1]
-#
-NEW_FOOD=New Food
-ADD_FOOD=Add New Food
-FOOD_GROUP=Food Group
-GROUP_NAME=Name of group
-FOOD_NAME=Name of food
-REFUSE_LBL=Refuse (part which is removed)
-NUTRITIONS_FOOD=Nutrients' values
-FOOD_DESCRIPTION=Description of food
-HOME_WEIGHTS=Home weights (if defined)
-WEIGHT_TYPE=Weight type
-AMOUNT_WEIGHT=Amount & Weight
-WEIGHT=Weight (g)
-UNITS=Units
-FOOD_GROUPS=Food Groups
-MEAL_GROUP=Meal Group
-SELECTED_GROUP=Selected Group
-SELECT_GROUP=Select Group
-PARENT_GROUP=Parent Group
-EDIT_MEAL_GROUP=Edit Meal Group
-ADD_MEAL_GROUP=Add Meal Group
-NEW_GROUP=New Group
-TRANSLATION_KEYWORD=Keyword for translation
-WISH_TO_SAVE_NEW_GROUP=You created a new group. Do you wish to save?
-WISH_TO_SAVE_EDITED_GROUP=You changed a group. Do you wish to save?
-ADD_FOOD_GROUP=Add Food Group
-EDIT_FOOD_GROUP=Edit Food Group
-
-#
-# !G! Meal [1]
-#
-NUTRITION_TYPE=Nutrition Type
-SELECTED_ITEM=Selected Item
-NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
-SELECTOR=Selector
-USDA_NUTRITION=USDA Nutrition
-USER_NUTRITION=User-defined Nutrition
-MEAL=Meal
-SELECT_ITEM=Select Item
-MEALS_FOODS_SELECTOR=Meals, Foods Selector
-MEAL_ADD=Meal Add
-MEAL_EDIT=Meal Edit
-MEAL_NAME=Meal Name
-AVAILABLE_NUTRITIONS=Available Nutrients
-FOODS_MEALS_NUTRITIONS=Foods, Meals and/or Nutritions
-MEAL_FOOD_ADD_DESC=Add Food, Meal or Nutrition
-MEAL_FOOD_EDIT_DESC=Edit Food, Meal or Nutrition
-MEAL_FOOD_DELETE_DESC=Delete Food, Meal or Nutrition
-MEAL_TYPE=Type
-DESCRIPTION=Description
-TRANSLATION_KEYWORD_MEAL=Translation Keyword
-TRANSLATED_NAME_MEAL=Translated Name
-GROUP=Group
-WISH_TO_SAVE_NEW_MEAL=You created a new meal. Do you wish to save?
-WISH_TO_SAVE_EDITED_MEAL=You changed a meal. Do you wish to save?
-NEW_MEAL=New Meal
-CANT_SELECT_CIRCULAR_MEAL=You can't add the same meal as the one you are editing.
-CANT_SELECT_CHILD_OR_GROUP=You can't select this group or a child of this group as parent!
-MEAL_VIEW=Meal View
-MEALS_DATABASE=Meals Database
-MEALS_DATABASE_DESC=<html><body>Meals database contains full meals. Good example would be 'McDonald's Big Mac Menu'. It contains several items from USDA database: Big Mac Hamburger, Coca-cola, etc. Meals can contain items from all databases: USDA, User or Meal database. </body></html>
-ADD_MEAL=Add Meal
-
-#
-# !G! Food (User) [1]
-#
-FOOD_EDIT=Edit Food
-SELECTED_NUTRITION=Selected Nutrient
-SELECT_NUTRITION=Select Nutrient
-SELECTED_HOME_WEIGHT=Selected Home Weight
-SELECT_HOME_WEIGHT=Select Home Weight
-NEW_NUTR_DEF=New
-WEIGHT_UNIT=W. Unit
-TAG=Tag
-SELECTOR_NUTRITION_DEFINITION=Selector for Nutrients
-NUTRITION_NAME=Name of Nutrient
-NUTRITION_SELECTOR=Nutrients Selector
-HOME_WEIGHT_SELECTOR=Home Weight Selector
-WISH_TO_SAVE_NEW_FOOD=You created a new food. Do you wish to save?
-WISH_TO_SAVE_EDITED_FOOD=You changed a food. Do you wish to save?
-NUTRITIONS=Nutrients
-SELECTOR_HOME_WEIGHT=Selector for Home Weights
-NEW_HOME_WEIGHT=New
-HOME_WEIGHT_NAME=Home Weight Name
-USER_DEFINED=User Defined
-HOME_WEIGHT_ADD_DESC=Add Home Weight
-HOME_WEIGHT_EDIT_DESC=Edit Home Weight
-HOME_WEIGHT_DELETE_DESC=Delete Home Weight
-
-#
-# !G! Daily Values and Foods [1]
-#
-WEIGHT_LBL2=Weight
-HOME_WEIGHTS_LBL=Home Weights
-WGHT_PER_AMOUNT=Weight/Amount
-WEIGHT_SHORT=Wgh.
-
-
-#
-# !G! Selector for Daily Value [1]
-#
-MEALS_FOODS_SELECTOR_DAILY=Meals, Foods Selector for Daily Entry
-NAME=Name
-HOME_WEIGHT=Home Weight
-NO_ITEM_SELECTED=No item selected.
-
-
-#
-# !G! Printing Food menu [2]
-#
-PRINT_FOOD_DESC=Food Description
-DATE=Date
-TIME=Time
-FOOD_MENU_BASE=Food Menu Base (CH only)
-
-FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
-FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
-FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
-
-
-REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
-TOGETHER=Together
-CH=CH
-
-INS=Ins
-BG=BG
-AMOUNT_SHORT=Am.
-
-
-
-#
-# !G! Nutrients [3]
-#
-PROCNT=Protein
-FAT=Total lipid (fat)
-CHOCDF=Carbohydrate, by difference
-ASH=Ash
-ENERC_KCAL=Energy (kcal)
-STARCH=Starch
-SUCS=Sucrose
-GLUS=Glucose (dextrose)
-FRUS=Fructose
-LACS=Lactose
-MALS=Maltose
-ALC=Alcohol, ethyl
-WATER=Water
-CAFFN=Caffeine
-GI=Glycemic Index
-GL=Glycemic Load
-GI_MIN=Glycemic Index (Min)
-GI_MAX=Glycemic Index (Max)
-GL_MIN=Glycemic Load (Min)
-GL_MAX=Glycemic Load (Max)
-ENERC_KJ=Energy
-SUGAR=Sugars, total
-GALS=Galactose
-FIBTG=Fiber, total dietary
-CA=Calcium, Ca
-FE=Iron, Fe
-MG=Magnesium, Mg
-P=Phosphorus, P
-K=Potassium, K
-NA=Sodium, Na
-ZN=Zinc, Zn
-CU=Copper, Cu
-FLD=Fluoride, F
-MN=Manganese, Mn
-SE=Selenium, Se
-VITA_IU=Vitamin A, IU
-VITA_RAE=Vitamin A, RAE
-CARTB=Carotene, beta
-CARTA=Carotene, alpha
-TOCPHA=Vitamin E (alpha-tocopherol)
-VITD-=Vitamin D
-VITB6A=Vitamin B-6
-VITB12=Vitamin B-12
-VITK=Vitamin K (phylloquinone)
-FAMS=Fatty acids, total monounsaturated
-FAPU=Fatty acids, total polyunsaturated
-CHOLE=Cholesterol
-FATRN=Fatty acids, total trans
-FASAT=Fatty acids, total saturated
-FATRNM=Fatty acids, total trans-monoenolic
-FATRNP=Fatty acids, total trans-polyenolic
-
-#
-# !G! Nutrients, not usually used [3]
-#
-FOL=Folate, total
-CHOLN=Choline, total
-THEBRN=Theobromine
-RETOL=Retinol
-CRYPX=Cryptoxanthin, beta
-LYCPN=Lycopene
-LUT+ZEA=Lutein + zeaxanthin
-TOCPHB=Tocopherol, beta
-TOCPHG=Tocopherol, gamma
-TOCPHD=Tocopherol, delta
-VITC=Vitamin C, total ascorbic acid
-THIA=Vitamin B1, Thiamin
-RIBF=Vitamin B2, Riboflavin
-NIA=Niacin
-PANTAC=Pantothenic acid
-FOLAC=Folic acid
-FOLFD=Folate, food
-FOLDFE=Folate, DFE
-BETN=Betaine
-TRP_G=Tryptophan
-THR_G=Threonine
-ILE_G=Isoleucine
-LEU_G=Leucine
-LYS_G=Lysine
-MET_G=Methionine
-CYS_G=Cystine
-PHE_G=Phenylalanine
-TYR_G=Tyrosine
-VAL_G=Valine
-ARG_G=Arginine
-HISTN_G=Histidine
-ALA_G=Alanine
-ASP_G=Aspartic acid
-GLU_G=Glutamic acid
-GLY_G=Glycine
-PRO_G=Proline
-SER_G=Serine
-HYP=Hydroxyproline
-PHYSTR=Phytosterols
-STID7=Stigmasterol
-CAMD5=Campesterol
-SITSTR=Beta-sitosterol
-
-
-
-
-#
-# !G! Home Weights - Translation [2]
-#
--TO-SERVE=to serve
-AFTER=after
-APPROX=approx
-AMOUNT=amount
-AVG.=avg.
-BLOCK=block
-BLOCKS=blocks
-BONE=bone
-BONELESS=boneless
-BOTTLE=bottle
-BAG=bag
-BAR=bar
-BIG=big
-BOX=box
-CAN=can
-CHOPPED=chopped
-CHUNK=chunk
-CHUNKS=chunks
-CONTAINER=container
-CONTENTS=contents
-COOKED=cooked
-COOKIE=cookie
-COOK=cook
-COOKING=cooking
-CRUMBLED=crumbled
-CRUSHED=crushed
-CUBED=cubed
-CUBIC=cubic
-CUT=cut
-CUBE=cube
-CUBES=cubes
-CUP=cup
-CUPCAKE=cupcake
-CUPS=cups
-CURD=curd
-DICED=diced
-DASH=dash
-DRAINED=drained
-DIA=diameter
-DIA.=diameter
-DIAM=diameter
-DIAM.=diameter
-DIAMETER=diameter
-ENVELOPE=envelope
-EXTRA=extra
-FOR=for
-FROM=from
-FROZEN=frozen
-FRUIT=fruit
-FRUITS=fruits
-FL=fl
-FLUID=fluid
-GROUND=ground
-G=g
-HIGH=high
-IN=in
-IN.=in.
-INCH=inch
-INSTANT=instant
-ITEM=item
-ITEMS=items
-INDIVIDUAL=individual
-JAR=jar
-JUMBO=jumbo
-
-
-LARGE=large
-LEAVES=leaves
-LONG=long
-LB=lb
-MAKE=make
-MASHED=mashed
-MAKES=makes
-MEDIUM=medium
-MEAT=meat
-ML=ml
-MELTED=melted
-NOT=not
-NET=net
-OUNCE=ounce
-OZ=oz
-OZ.=oz.
-OR=or
-PACK=pack
-PACKAGE=package
-PACKET=packet
-PACKAGES=packages
-PACKED=packed
-PAT=pat
-PATTY=patty
-
-PIECE=piece
-PIECES=pieces
-PKG.=pkg.
-POD=pod
-PODS=pods
-PORTION=portion
-POWDER=powder
-
-PRODUCT=product
-PREPARED=prepared
-
-QUART=quart
-
-RAW=raw
-READY=ready
-READY-TO=ready to
-READY-TO-COOK=ready to cook
-READY-TO-EAT=ready to eat
-READY-TO-SERVE=ready to serve
-RECIPE=recipe
-RECONSTITUTED=reconstituted
-
-REFRIGATED=refrigirated
-REFRIGERATED=refrigerated
-REFUSE=refuse
-REGULAR=regular
-REMOVED=removed
-
-
-ROLL=roll
-ROLLS=rolls
-SCOOP=scoop
-SERVING=serving
-SERVINGS=servings
-SHREDDED=shredded
-SHELLED=shelled
-
-SIFTED=sifted
-SIZE=size
-
-SMALL=small
-SMALLER=smaller
-SKIN=skin
-SLICE=slice
-SLICED=sliced
-SLICES=slices
-SNACK=snack
-SNACK-SIZE=snack size
-SQ=sq
-SPRIG=sprig
-SPRIGS=sprigs
-
-SPOON=spoon
-STICK=stick
-STICKS=sticks
-TABLESPOON=table spoon
-TBSP=table spoon
-TBS=table spoon
-TEASPOON=tea spoon
-TO=to
-
-TSP=tea spoon
-THAWED=thawed
-THICK=thick
-THIN=thin
-THICK.=thick.
-UNIT=unit
-UNPACKED=unpacked
-UNPEELED=unpeeled
-UNPREPARED=unprepared
-UNSIFTED=unsifted
-UNTHAWED=unthawed
-UNDILUTED=undiluted
-UNDRAINED=undrained
-UNHEATED=unheated
-
-WHOLE=whole
-WITH=with
-WITHOUT=without
-WRAPPED=wrapped
-
-WEDGE=wedge
-WEDGES=wedges
-WHIPPED=whipped
-
-YIELD=yield
-YIELDS=yields
-X=x
-
-
-
-#
-# !G! Food translations [3]
-#
-MILK=milk
-EGG=egg
-STEAK=steak
-HEADS=heads
-
-
-
Deleted: trunk/ggc-nutri/src/GGC_Nutrition_fr.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_fr.properties 2016-12-25 18:55:50 UTC (rev 1441)
+++ trunk/ggc-nutri/src/GGC_Nutrition_fr.properties 2016-12-25 19:22:53 UTC (rev 1442)
@@ -1,537 +0,0 @@
-#
-# ######################################################################
-# ### GNU Gluco Control - Nutrition File ###
-# ######################################################################
-# ### Language: English ###
-# ### Created by: Andy Rozman (an...@tr...) ###
-# ### Last change: 08. December 2008 ###
-# ### Application Version: 0.4 ###
-# ######################################################################
-#
-# Please use this file as default language file. Do not try to translate
-# from any other files, since this is the Master language file. Create the
-# same header and specify application version number for easier changes at
-# later time.
-# Translations should be grouped by groups as specified here.
-# Older groups are done by packages, newer by logical name.
-#
-# This part is intended for nutrition only, everything that is done
-# by nutrition is here.
-#
-# In data folder there is nutrition folder containg all untranslated words
-# for both: home weights and foods. If we want to achieve full translation
-# of nutrition database, then we need to translate all words. This will be
-# done with time, but it's not priority at this time. So far most common [TODO]
-#
-# 383
-#
-# In brackets there are now tags which define urgency of some text beeing translated
-# 1 - Needed, urgent (dialogs)
-# 2 - Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
-# 3 - Not so important, but nice to have
-#
-
-
-#
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standarn, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES = < a,A,\u00E0,\u00C0,\u00E2,\u00c2 < b,B < c,C,\u00E7,\u00c7 < d,D <e,E,\u00E9,\u00C9,\u00E8,\u00C8,\u00EA,\u00CA,\u00EB,\u00cb < f,F < g,G < h,H < i,I,\u00EF,\u00cf < j,J < k,K < l,L < m,M < n,N < o,O,\u00F4,\u00d4 < p,P < q,Q < r,R < s,S < t,T < u,U,\u00FB,\u00db,\u00F9,\u00d9,\u00FC,\u00dc < v,V < w,W < x,X < y,Y < z,Z
-
-
-
-#
-# Global (1)
-#
-DELETE=Effacer
-ADD=Ajouter
-EDIT=Modifier
-NEW=Nouveau
-INFORMATION=Information
-QUESTION=Question
-YES=Oui
-NO=Non
-OK=OK
-CANCEL=Annuler
-APPLY=Appliquer
-SELECT=S\u00E9lectionner
-HELP=Aide
-ROOT=Racine
-
-#
-# Global Dialogs (1)
-#
-SELECT_ITEM_FIRST=S\u00E9lectinnez un \u00E9l\u00E9ment, puis cliquez sur Action !
-ARE_YOU_SURE_DELETE=\u00CAtes vous s\u00FBr de vouloir supprimer cet \u00E9l\u00E9ment?
-TRANSLATED_NAME=Nom Traduit (si disponible)
-ID=Id
-USDA_NUTRITION_DATABASE=Base de Donn\u00E9es Alimentation USDA
-USER_NUTRITION_DATABASE=Base de D. Alimentation Utilisateur
-MEALS_DATABASE=Base de Donn\u00E9es Repas
-USDA_NUTRITION_DATABASE_DESC=<html><body>La BD du Département de l'Agriculture des États-Unis (United States Department of Agriculture database, USDA) contient des informations relatives à de nombreux aliments utilisés et commercialisés aux USA. Comme cette BD est largement utilisée autour du monde, nous l'avons incorporée pour vous permettre de l'utiliser. La version de la BD est celle que nous avons importée. Les versions 18 et ultérieures sont utilisables (testé avec SR-18).<br>Dans ce module, vous pouvez consulter toutes les entrées. Si vous l'avez démarré à partir d'un autre module (comme les repas), vous pouvez sélectionner un aliment et l'importer.</body></html>
-USER_NUTRITION_DATABASE_DESC=<html><body>C'est la base de données alimentation dans laquelle l'utilisateur peut ajouter des entrées. Plus tard nous supporterons l'importation à partir d'autres bases de données (qui seront alors modifiables). Vous pourrez ainsi profiter de la structure de dossier étendue (chaque répertoire peut avoir un sous répertoire). Si, par exemple, vous êtes Allemand, vous pouvez créer un répertoire nommé "Alimentation Allemande", dans lequel vous pourrez créer d'autres groupes (i.e. prêt pour le micro-onde, types d'aliments, fabricants, etc).</body></html>
-MEALS_DATABASE_DESC=<html><body>La BD Repas contient des repas complets. Un bon exemple pourrait-être un menu 'Sandwich'. Il contiendrait différents aliments présents dans la BD USDA : Gros Sandwich, Soda, etc. Les repas peuvent contenir des éléments de toutes les BD : USDA, Utilisateur ou BD Repas. </body></html>
-USDA_NUTRITION_DB=BD Alimentation USDA
-USER_NUTRITION_DB=BD Alimentation Utilisateur
-MEALS_DB=Base de Donn\u00E9es Repas
-NONE=Aucun
-NUTRITION=Nutriment
-AMOUNT_LBL=Quantit\u00E9
-
-
-
-
-#
-# Popup Menu (1)
-#
-PM_NUT_VIEW=Voir
-PM_NUT_CLOSE=Fermer
-PM_NUT_EDIT_GROUP=Modifier Groupe
-PM_NUT_ADD_GROUP=Ajouter Groupe
-PM_NUT_ADD_FOOD_DESCRIPTION=Ajouter Composition Aliment
-PM_NUT_EDIT_FOOD_DESCRIPTION=Modifier Composition Aliment
-PM_NUT_ADD_MEAL=Ajouter Repas
-PM_NUT_EDIT_MEAL=Modifier Repas
-
-
-
-#
-# Backup Objects (1)
-#
-NUTRITION_OBJECTS=Objets Aliment
-USER_FOOD_GROUPS=Groupes d'Aliments Utilisateur
-MEAL_GROUPS=Groupes Repas
-MEALS=Repas
-FOODS=Aliments
-
-
-#
-# Food (1)
-#
-NEW_FOOD=Aliment Nouveau
-ADD_FOOD=Ajouter Aliment Nouveau
-FOOD_GROUP=Groupe d'Aliments
-GROUP_NAME=Nom du Groupe
-FOOD_NAME=Nom de l'Aliment
-REFUSE_LBL=Refuser (Partie qui est refus\u00E9e)
-NUTRITIONS_FOOD=Valeur du Nutriment
-FOOD_DESCRIPTION=Composition de l'Aliment
-HOME_WEIGHTS=Masse Perso (si d\u00E9finie)
-WEIGHT_TYPE=Type de Masse
-AMOUNT_WEIGHT=Quantit\u00E9 & Masse
-WEIGHT=Masse (g)
-UNITS=Unit\u00E9s
-FOOD_GROUPS=Groupes d'Aliment
-MEAL_GROUPS=Groupes de Repas
-MEAL_GROUP=Groupe de Repas
-SELECTED_GROUP=Groupe S\u00E9l\u00E9ctionn\u00E9
-SELECT_GROUP=S\u00E9lectionner un Groupe
-PARENT_GROUP=Groupe Parent
-EDIT_MEAL_GROUP=Modifier le Groupe Repas
-ADD_MEAL_GROUP=Ajouter un Groupe Repas
-NEW_GROUP=Nouveau Groupe
-TRANSLATION_KEYWORD=Mot-cl\u00E9 pour traduire
-WISH_TO_SAVE_NEW_GROUP=Nouveau Groupe Cr\u00E9\u00E9. Sauvegarder ?
-WISH_TO_SAVE_EDITED_GROUP=Groupe Modifi\u00E9. Sauvegarder ?
-ADD_FOOD_GROUP=Ajouter Groupe d'Aliments
-EDIT_FOOD_GROUP=Modifier Groupe d'Aliments
-
-#
-# Meal (1)
-#
-NUTRITION_TYPE=Type d'Alimentation
-SELECTED_ITEM=S\u00E9lectionner un \u00E9l\u00E9ment
-NUTRITION_TYPE_FOR_SELECTOR=Type d'Alimentation pour le s\u00E9lecteur
-SELECTOR=S\u00E9lecteur
-USDA_NUTRITION=Alimentation USDA
-USER_NUTRITION=Alimentation d\u00E9finie par Utilisateur
-MEAL=Repas
-SELECT_ITEM=S\u00E9lectionner \u00E9l\u00E9ment
-MEALS_FOODS_SELECTOR=S\u00E9lecteur de Repas, d'Aliments
-MEAL_ADD=Ajouter Repas
-MEAL_EDIT=Modifier Repas
-MEAL_NAME=Nom Repas
-AVAILABLE_NUTRITIONS=Nutiments Disponibles
-FOODS_MEALS_NUTRITIONS=Aliments, Repas et/ou Alimentations
-MEAL_FOOD_ADD_DESC=Ajouter Aliment, Repas ou Alimentation
-MEAL_FOOD_EDIT_DESC=Modifier Aliment, Repas ou Alimentation
-MEAL_FOOD_DELETE_DESC=Effacer Aliment, Repas ou Alimentation
-MEAL_TYPE=Type
-DESCRIPTION=Composition
-TRANSLATION_KEYWORD_MEAL=Mot cl\u00E9 Traduction
-TRANSLATED_NAME_MEAL=Nom traduit
-GROUP=Groupe
-WISH_TO_SAVE_NEW_MEAL=Nouveau repas Cr\u00E9\u00E9. Sauvegarder ?
-WISH_TO_SAVE_EDITED_MEAL=Repas Modifi\u00E9. Sauvegarder ?
-NEW_MEAL=Nouveau Repas
-CANT_SELECT_CIRCULAR_MEAL=Impossible d'ajouter un repas identique \u00E0 celui qui est en cours d'\u00E9dition.
-CANT_SELECT_CHILD_OR_GROUP=Impossible de s\u00E9lectionner ce groupe ou un de ses fils comme parent!
-MEAL_VIEW=Voir Repas
-ADD_MEAL=Ajouter Repas
-
-#
-# Food (User) (1)
-#
-FOOD_EDIT=Modifier Aliment
-SELECTED_NUTRITION= Nutriment S\u00E9lectionn\u00E9
-SELECT_NUTRITION=S\u00E9lectionner Nutriment
-SELECTED_HOME_WEIGHT=Masse Perso S\u00E9lectionn\u00E9e
-SELECT_HOME_WEIGHT=S\u00E9lectionner Masse Perso
-NEW_NUTR_DEF=Nouveau
-WEIGHT_UNIT=Unit\u00E9 M.
-TAG=Marqueur
-SELECTOR_NUTRITION_DEFINITION=S\u00E9lecteur de Nutriment
-NUTRITION_NAME=Nom du Nutriment
-NUTRITION_SELECTOR=S\u00E9lecteur de Nutriments
-HOME_WEIGHT_SELECTOR=S\u00E9lecteur Masse Perso
-WISH_TO_SAVE_NEW_FOOD=Aliment Nouveau Cr\u00E9\u00E9. Sauvegarder ?
-WISH_TO_SAVE_EDITED_FOOD=Aliment Modifi\u00E9. Sauvegarder ?
-NUTRITIONS=Nutriments
-SELECTOR_HOME_WEIGHT=S\u00E9lecteur pour Masse Perso
-NEW_HOME_WEIGHT=Nouveau
-HOME_WEIGHT_NAME=Nom Masse Perso
-USER_DEFINED=D\u00E9fini(e) par utilisateur
-HOME_WEIGHT_ADD_DESC=Ajouter Masse Perso
-HOME_WEIGHT_EDIT_DESC=Modifier Masse Perso
-HOME_WEIGHT_DELETE_DESC=Supprimer Masse Perso
-
-#
-# Daily Values and Foods (1)
-#
-WEIGHT_LBL2=Masse
-WEIGHT_TYPE=Type de Masse
-HOME_WEIGHTS_LBL=Masses Perso
-WGHT_PER_AMOUNT=Masse /Quantit\u00E9
-WEIGHT_SHORT=M.
-
-
-#
-# Selector for Daily Value (1)
-#
-MEALS_FOODS_SELECTOR_DAILY=S\u00E9lecteur Repas, Aliments pour Saisie quotidienne
-NAME=Nom
-HOME_WEIGHT=Masse Perso
-NO_ITEM_SELECTED=Aucun \u00C9l\u00E9ment S\u00E9lectionner.
-
-#
-# Printing Food menu (2)
-#
-PRINT_FOOD_DESC=Composition Aliment
-DATE=Date
-TIME=Heure
-FOOD_MENU_BASE=Menu Aliment de Base (HC uniquement)
-
-FOOD_MENU_EXT_I=Menu Aliment \u00C9tendu I (HC,Ins)
-FOOD_MENU_EXT_II=Menu Aliment \u00C9tendu II (HC,Ins,Gly)
-FOOD_MENU_EXT_III=Menu Aliment \u00C9tendu III (HC,Ins,Gly,kJ)
-
-
-REPORT_FOOTER=Rapport cr\u00E9\u00E9 par \"GGC - GNU Gluco Control\", logiciel libre disponible sur http://ggc.sourceforge.net
-TOGETHER=Ensemble
-CH=HC
-
-INS=Ins
-BG=Gly
-AMOUNT_SHORT=Qt\u00E9
-
-
-
-#
-# Nutrients (2)
-#
-PROCNT=Prot\u00E9ine
-FAT=Total des lipides (mati\u00E8res grasses)
-CHOCDF=Hydrates de Carbone, par diff\u00E9rence
-ASH=Mati\u00E8re s\u00E8che
-ENERC_KCAL=\u00C9nergie (Kcal)
-STARCH=Amidon
-SUCS=Saccharose
-GLUS=Glucose (dextrose)
-FRUS=Fructose
-LACS=Lactose
-MALS=Maltose
-ALC=Alcool, \u00E9thanol
-WATER=Eau
-CAFFN=Caf\u00E9ine
-GI=Index Glyc\u00E9mique
-GL=Charge Glyc\u00E9mique
-GI_MIN=Index Glyc\u00E9mique (Min)
-GI_MAX=Index Glyc\u00E9mique (Max)
-GL_MIN=Charge Glyc\u00E9mique (Min)
-GL_MAX=Charge Glyc\u00E9mique (Max)
-ENERC_KJ=\u00C9nergie
-SUGAR=Sucre, total
-GALS=Galactose
-FIBTG=Fibre, alimentaire totale
-CA=Calcium, Ca
-FE=Fer, Fe
-MG=Magn\u00E9sium, Mg
-P=Phosphore, P
-K=Potassium, K
-NA=Sodium, Na
-ZN=Zinc, Zn
-CU=Cuivre, Cu
-FLD=Fluor, F
-MN=Mangan\u00E8se, Mn
-SE=S\u00E9l\u00E9nium, Se
-VITA_IU=Vitamine A, IU
-VITA_RAE=Vitamine A, RAE
-CARTB=Carot\u00E8ne, b\u00EAta
-CARTA=Carot\u00E8ne, alpha
-TOCPHA=Vitamine E (alpha-tocopherol)
-VITD-=Vitamine D
-VITB6A=Vitamine B-6
-VITB12=Vitamine B-12
-VITK=Vitamine K (phylloquinone)
-FAMS=Acides gras, total monoinsatur\u00E9s
-FAPU=Acides gras, total polyinsatur\u00E9s
-CHOLE=Cholest\u00E9rol
-FATRN=Acides gras, total trans
-FASAT=Acides gras, total saturat\u00E9s
-FATRNM=Acides gras, total trans-mono\u00E9noliques
-FATRNP=Acides gras, total trans-poly\u00E9noliques
-
-#
-# Nutrients (3)
-#
-FOL=Folate, total
-CHOLN=Choline, total
-THEBRN=Th\u00E9obromine
-RETOL=R\u00E9tinol
-CRYPX=Cryptoxanthine, b\u00EAta
-LYCPN=Lycop\u00E8ne
-LUT+ZEA=Lut\u00E9ine + z\u00E9axanthine
-TOCPHB=Tocoph\u00E9rol, b\u00EAta
-TOCPHG=Tocoph\u00E9rol, gamma
-TOCPHD=Tocoph\u00E9rol, delta
-VITC=Vitamine C, total acide ascorbique
-THIA=Thiamine
-RIBF=Riboflavine
-NIA=Niacine
-PANTAC=Acide Pantoth\u00E9nique
-FOLAC=Acide Folique
-FOLFD=Folate, alimentaire
-FOLDFE=Folate, DFE
-BETN=B\u00E9ta\u00EFne
-TRP_G=Tryptophane
-THR_G=Thr\u00E9onine
-ILE_G=Isoleucine
-LEU_G=Leucine
-LYS_G=Lysine
-MET_G=M\u00E9thionine
-CYS_G=Cystine
-PHE_G=Ph\u00E9nylalanine
-TYR_G=Tyrosine
-VAL_G=Valine
-ARG_G=Arginine
-HISTN_G=Histidine
-ALA_G=Alanine
-ASP_G=Acide Aspartique
-GLU_G=Acide Glutamique
-GLY_G=Glycine
-PRO_G=Proline
-SER_G=S\u00E9rine
-HYP=Hydroxyproline
-PHYSTR=Phytost\u00E9rols
-STID7=Stigmast\u00E9rol
-CAMD5=Campest\u00E9rol
-SITSTR=B\u00EAta-sitost\u00E9rol
-
-
-
-
-#
-# Home Weights - Translation (2,3)
-#
--TO-SERVE=\u00E0 servir
-AFTER=apr\u00E8s
-APPROX=approx
-AMOUNT=quantit\u00E9
-AVG.=moy.
-BLOCK=bloc
-BLOCKS=blocs
-BONE=avec os
-BONELESS=d\u00E9soss\u00E9(e)
-BOTTLE=bottle
-BAG=sac
-BAR=barre
-BIG=grand
-BOX=bo\u00EEte
-CAN=p\u00F4t
-CHOPPED=hach\u00E9
-CHUNK=gros morceau
-CHUNKS=gros morceaux
-CONTAINER=r\u00E9cipient
-CONTENTS=contenus
-COOKED=cuisin\u00E9
-COOKIE=petit g\u00E2teau
-COOK=cuisiner
-COOKING=cuisiner
-CRUMBLED=\u00E9miett\u00E9
-CRUSHED=\u00E9cras\u00E9
-CUBED=coup\u00E9 en cubes
-CUBIC=cubique
-CUT=coup\u00E9
-CUBE=cube
-CUBES=cubes
-CUP=tasse
-CUPCAKE=petit g\u00E2teau
-CUPS=tasses
-CURD=caill\u00E9
-DICED=en d\u00E9s
-DASH=petite quantit\u00E9
-DRAINED=s\u00E9ch\u00E9
-DIA=diam\u00E8tre
-DIA.=diam\u00E8tre.
-DIAM=diam\u00E8tre
-DIAM.=diam\u00E8tre.
-DIAMETER=diam\u00E8trer
-ENVELOPE=enveloppe
-EXTRA=extra
-FOR=pour
-FROM=depuis
-FROZEN=gel\u00E9
-FRUIT=fruit
-FRUITS=fruits
-FL=fl
-FLUID=fluide
-GROUND=surface
-G=g
-HIGH=hauteur
-IN=in
-IN.=in.
-INCH=inch
-INSTANT=instant
-ITEM=\u00E9l\u00E9ment
-ITEMS=\u00E9l\u00E9ments
-INDIVIDUAL=individuel
-JAR=jarre
-JUMBO=g\u00E9ant
-
-
-LARGE=large
-LEAVES=feuilles
-LONG=longueur
-LB=lb
-MAKE=pr\u00E9parer
-MASHED=en pur\u00E9e
-MAKES=pr\u00E9pare
-MEDIUM=m\u00E9dium
-MEAT=viande
-ML=mL
-MELTED=fondu
-NOT=pas
-NET=net
-OUNCE=ounce
-OZ=oz
-OZ.=oz.
-OR=or
-PACK=paquet
-PACKAGE=paquet
-PACKET=paquet
-PACKAGES=paquets
-PACKED=empaquet\u00E9
-PAT=tout pr\u00EAt
-PATTY=petit p\u00E2t\u00E9
-
-PIECE=part
-PIECES=parts
-PKG.=pkg.
-POD=pod
-PODS=pods
-PORTION=portion
-POWDER=poudre
-
-PRODUCT=produit
-PREPARED=pr\u00E9par\u00E9
-
-QUART=litre
-
-RAW=ligne
-READY=pr\u00EAt
-READY-TO=pr\u00EAt \u00E0
-READY-TO-COOK=pr\u00EAt \u00E0 cuisiner
-READY-TO-EAT=pr\u00EAt \u00E0 manger
-READY-TO-SERVE=pr\u00EAt \u00E0 servir
-RECIPE=recette
-RECONSTITUTED=reconstitu\u00E9
-
-REFRIGATED=r\u00E9frig\u00E9r\u00E9
-REFRIGERATED=r\u00E9frig\u00E9r\u00E9
-REFUSE=refuser
-REGULAR=ordinaire
-REMOVED=retir\u00E9
-
-
-ROLL=rouleau
-ROLLS=rouleaux
-ROOT=racine
-SCOOP=scoop
-SERVING=portion
-SERVINGS=portions
-SHREDDED=r\u00E2p\u00E9
-SHELLED=\u00E9coss\u00E9
-
-SIFTED=tamis\u00E9
-SIZE=taille
-
-SMALL=petit
-SMALLER=plus petit
-SKIN=peau
-SLICE=tranche
-SLICED=tranch\u00E9
-SLICES=tranches
-SNACK=snack
-SNACK-SIZE=taille du snack
-SQ=sq
-SPRIG=brin
-SPRIGS=brins
-
-SPOON=cuill\u00E8re
-STICK=baguette
-STICKS=baguettes
-TABLESPOON=cuill\u00E8re \u00E0 soupe
-TBSP=cuill\u00E8re \u00E0 soupe
-TBS=cuill\u00E8re \u00E0 soupe
-TEASPOON=cuill\u00E8re \u00E0 caf\u00E9
-TO=\u00E0
-
-TSP=cuill\u00E8re \u00E0 caf\u00E9
-THAWED=congel\u00E9
-THICK=\u00E9pais
-THIN=mince
-THICK.=d'\u00E9paisseur.
-UNIT=unit\u00E9
-UNPACKED=d\u00E9ball\u00E9
-UNPEELED=non pel\u00E9es
-UNPREPARED=non pr\u00E9par\u00E9
-UNSIFTED=non tamis\u00E9e
-UNTHAWED=d\u00E9congel\u00E9
-UNDILUTED=non dilu\u00E9
-UNDRAINED=non drain\u00E9
-UNHEATED=cru
-
-WHOLE=complet
-WITH=avec
-WITHOUT=sans
-WRAPPED=envelopp\u00E9
-
-WEDGE=morceau
-WEDGES=morceaux
-WHIPPED=fouett\u00E9
-
-YIELD=gain
-YIELDS=gains
-X=x
-
-
-
-#
-# Food translations (3)
-#
-MILK=lait
-EGG=\u0153uf
-STEAK=steak
-HEADS=t\u00EAtes
Deleted: trunk/ggc-nutri/src/GGC_Nutrition_si.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_si.properties 2016-12-25 18:55:50 UTC (rev 1441)
+++ trunk/ggc-nutri/src/GGC_Nutrition_si.properties 2016-12-25 19:22:53 UTC (rev 1442)
@@ -1,507 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: Sloevene ###
-# ### Created by: Andy (an...@t-...) ###
-# ### Version: 1.3.1 ###
-# ### Last change: 26.3.2013 11:30:35 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 418
-# Not translated: 0 (0 %)
-# Need to be checked: 72 (17 %)
-#
-# Translated: 346 (82 %)
-#
-#
-# This comment will be displayed after header
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< a,A < b,B < c,C < \u010D,\u010C < d,D < e,E < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O < p,P < q,Q < r,R < s,S < \u0161,\u0160 < t,T < u,U < v,V < w,W < x,X < y,Y < z,Z < \u017E,\u017D
-
-#
-# Global [1]
-#
-DELETE=Zbri\u0161i
-ADD=Dodaj
-EDIT=Spremeni
-NEW=Nov
-INFORMATION=Informacija
-QUESTION=Vpra\u0161anje
-YES=Da
-NO=Ne
-OK=OK
-CANCEL=Prekini
-APPLY=Nastavi
-SELECT=Izberi
-HELP=Pomo\u010D
-ROOT=korenina
-
-#
-# Global Dialogs [1]
-#
-SELECT_ITEM_FIRST=Izberite vnos, preden izberete akcijo !
-ARE_YOU_SURE_DELETE=Ste prepri\u010Dani da \u017Eelite odstraniti ta vnos?
-TRANSLATED_NAME=Prevedeno ime (\u010De obstaja)
-ID=Id
-USDA_NUTRITION_DATABASE=Baza USDA \u017Eivil
-USER_NUTRITION_DATABASE=Baza uporabni\u0161kih \u017Eivil
-USDA_NUTRITION_DATABASE_DESC=<html><body>USDA baza je baza oddelka za kmetijstvo Zdru\u017Eenih dr\u017Eav Amerike in vsebuje dosti \u017Eivil, ki so v prodaji v ZDA. Ker se baza uporablja po celem svetu smo se odlo\u010Dili, da jo dodamo v na\u0161 program, tako da jo lahko tudi na\u0161i uporabniki uporabljajo. Verzija baze je odvisna od datotek, ki smo jih uporabili za vnos. Verzije 18 in ve\u010D so podprte (testirano s SR-18 in SR-20 (trenutna verzija)).<br>Modul omogo\u010Da pregled vseh vrednosti, iz dolo\u010Denih delov programa (recimo Obroki) pa tudi izbiro trenutno ozna\u010Denega elementa.</body></html>
-USER_NUTRITION_DATABASE_DESC=<html><body>To je baza \u017Eivil, v katero lahko uporabnik sam poljubno dodaja nova \u017Eivila. Kasneje bomo podpirali uvoz baz tujih \u017Eivil (ki jih bomo lahko spreminjali). V tej bazi lahko izkoristite zmo\u017Enost neomejenega dodajanja podmap (neomejeno v globino). \u010Ce ste recimo iz Slovenije dodate mapo Slovenske jedi, v katero se lahko dodajo razli\u010Dne podskupine (recimo Za mikrovalovno, tipi \u017Eivil/hrane, proizvajalce, itd.)</body></html>
-USDA_NUTRITION_DB=Baza USDA \u017Eivil
-USER_NUTRITION_DB=Baza Uporabni\u0161kih \u017Eivil
-MEALS_DB=Baza jedi
-NONE=Nobeden
-NUTRITION=Hranilo
-AMOUNT_LBL=Koli\u010Dina
-
-#
-# Menus [0]
-#
-
-# main menus
-MN_FOOD=H&rana
-MN_NUTRDB_USDB=Prehrambena baza (USDA)
-MN_NUTRDB_USDB_DESC=Baza prehrambenih izdelkov USDA
-MN_NUTRDB_USER=Prehrambena baza (Uporabni\u0161ka)
-MN_NUTRDB_USER_DESC=Baza prehrambenih izdelkov uporabnika
-MN_MEALS=Baza obrokov
-MN_MEALS_DESC=Baza obrokov
-MN_FOODMENU=Jedilniki
-MN_FOODMENU_DESC=Poro\u010Dila jedilnikov
-MN_FOODMENU_SIMPLE=Preprost (samo OH)
-MN_FOODMENU_SIMPLE_DESC=Preprost jedilnik (samo OH)
-MN_FOODMENU_EXT1=Raz\u0161irjen I (CH,Ins)
-MN_FOODMENU_EXT1_DESC=Raz\u0161irjen jedilnik I (OH,Ins)
-MN_FOODMENU_EXT2=Raz\u0161irjen II (OH,Ins,KS)
-MN_FOODMENU_EXT2_DESC=Raz\u0161irjen jedilnik II (OH,Ins,KS)
-MN_FOODMENU_EXT3=Raz\u0161irjen III (OH,Ins,KS,kJ)
-MN_FOODMENU_EXT3_DESC=Raz\u0161irjen jedilnik III (OH,Ins,KS,kJ)
-
-#
-# Popup Menu [1]
-#
-PM_NUT_VIEW=Pogled
-PM_NUT_CLOSE=Zapri
-PM_NUT_EDIT_GROUP=Spremeni skupino
-PM_NUT_ADD_GROUP=Dodaj skupino
-PM_NUT_ADD_FOOD_DESCRIPTION=Dodaj opis hrane
-PM_NUT_EDIT_FOOD_DESCRIPTION=Spremeni opis hrane
-PM_NUT_ADD_MEAL=Dodaj jed
-PM_NUT_EDIT_MEAL=Spremeni jed
-
-#
-# Backup Objects [1]
-#
-NUTRITION_OBJECTS=Objekti prehrane
-USER_FOOD_GROUPS=Uporabni\u0161ke skupine \u017Eivil
-MEAL_GROUPS=Skupine obrokov
-MEALS=Obroki
-FOODS=\u017Divila
-
-#
-# Food [1]
-#
-NEW_FOOD=Novo \u017Eivilo
-ADD_FOOD=Dodaj novo \u017Eivilo
-FOOD_GROUP=Skupina \u017Eivil
-GROUP_NAME=Ime skupine
-FOOD_NAME=Ime \u017Eivila
-REFUSE_LBL=Odpadni del (neu\u017Eitni del)
-NUTRITIONS_FOOD=Hranilne vrednosti
-FOOD_DESCRIPTION=Opis \u017Eivila
-HOME_WEIGHTS=Doma\u010De mere (\u010De obstajajo)
-WEIGHT_TYPE=Tip te\u017Ee
-AMOUNT_WEIGHT=Koli\u010Dina & Te\u017Ea
-WEIGHT=Te\u017Ea (g)
-UNITS=Enote
-FOOD_GROUPS=Skupine \u017Eivil
-MEAL_GROUP=Skupina obroka
-SELECTED_GROUP=Izbrana skupina
-SELECT_GROUP=Izberi skupino
-PARENT_GROUP=Star\u0161evska skupina
-EDIT_MEAL_GROUP=Spremeni skupino obroka
-ADD_MEAL_GROUP=Dodaj skupino obroka
-NEW_GROUP=Nova skupina
-TRANSLATION_KEYWORD=Klju\u010D za prevod
-WISH_TO_SAVE_NEW_GROUP=Ustvarili ste novo skupino. Jo \u017Eelite shraniti?
-WISH_TO_SAVE_EDITED_GROUP=Spremenili ste skupino. Jo \u017Eelite shraniti?
-ADD_FOOD_GROUP=Dodaj skupino \u017Eivil
-EDIT_FOOD_GROUP=Spremeni skupino \u017Eivil
-
-#
-# Meal [1]
-#
-NUTRITION_TYPE=Tip \u017Eivila
-SELECTED_ITEM=Izbran element
-NUTRITION_TYPE_FOR_SELECTOR=Tip \u017Eivila za izbirnik
-SELECTOR=Izbirnik
-USDA_NUTRITION=USDA \u017Eivilo
-USER_NUTRITION=Uporabni\u0161ko \u017Eivilo
-MEAL=Obrok
-SELECT_ITEM=Izberi element
-MEALS_FOODS_SELECTOR=Izbirnik \u017Eivil in obrokov
-MEAL_ADD=Dodaj obrok
-MEAL_EDIT=Spremeni obrok
-MEAL_NAME=Ime obroka
-AVAILABLE_NUTRITIONS=Dostopna hranila
-FOODS_MEALS_NUTRITIONS=\u017Divila in obroki
-MEAL_FOOD_ADD_DESC=Dodaj \u017Eivila in/ali obroke
-MEAL_FOOD_EDIT_DESC=Spremeni \u017Eivila in/ali obroke
-MEAL_FOOD_DELETE_DESC=Odstrani \u017Eivila in/ali obroke
-MEAL_TYPE=Tip
-DESCRIPTION=Opis
-TRANSLATION_KEYWORD_MEAL=Klju\u010D za prevod
-TRANSLATED_NAME_MEAL=Prevedeno ime
-GROUP=Skupina
-WISH_TO_SAVE_NEW_MEAL=Ustvarili ste nov obrok. Ga \u017Eelite shraniti?
-WISH_TO_SAVE_EDITED_MEAL=Spremenili ste obrok. Ga \u017Eelite shraniti?
-NEW_MEAL=Nov obrok
-CANT_SELECT_CIRCULAR_MEAL=Ne morete dodati obroka, ki ga spreminjate.
-CANT_SELECT_CHILD_OR_GROUP=Te skupine, ali njenega otroka ne morete dodati kot star\u0161a!
-MEAL_VIEW=Pogled obroka
-MEALS_DATABASE=Baza jedi
-MEALS_DATABASE_DESC=<html><body>Baza obrokov vsebuje celotne obroke. Dober primer je 'McDonaldsov Big Mac Meni'. Vsebuje \u0161tevilne vnose iz USDA baze: Big Mac, Coca-colo, itd.<br>Obroki lahko vsebujejo elemente iz vseh treh baz: USDA, Uporabni\u0161ke in/ali baze obrokov. </body></html>
-ADD_MEAL=Dodaj obrok
-
-#
-# Food (User) [1]
-#
-FOOD_EDIT=Spremeni \u017Eivilo
-SELECTED_NUTRITION=Izbrano hranilo
-SELECT_NUTRITION=Izberi hranilo
-SELECTED_HOME_WEIGHT=Izbrana doma\u010Da mera
-SELECT_HOME_WEIGHT=Izberi doma\u010Do mero
-NEW_NUTR_DEF=Novo
-WEIGHT_UNIT=Tip mere
-TAG=Oznaka
-SELECTOR_NUTRITION_DEFINITION=Izbirnik za hranila
-NUTRITION_NAME=Ime hranila
-NUTRITION_SELECTOR=Izbirnik hranil
-HOME_WEIGHT_SELECTOR=Izbirnik za doma\u010De mere
-WISH_TO_SAVE_NEW_FOOD=Ustvarili ste novo \u017Eivilo. \u017Delite shraniti?
-WISH_TO_SAVE_EDITED_FOOD=Spremenili ste \u017Eivilo. \u017Delite shraniti?
-NUTRITIONS=Hranila
-SELECTOR_HOME_WEIGHT=Izbirnik za doma\u010De mere
-NEW_HOME_WEIGHT=Nova
-HOME_WEIGHT_NAME=Ime doma\u010De mere
-USER_DEFINED=Uporabni\u0161ko definirano
-HOME_WEIGHT_ADD_DESC=Dodaj doma\u010Do mero
-HOME_WEIGHT_EDIT_DESC=Spremeni doma\u010Do mero
-HOME_WEIGHT_DELETE_DESC=Odstrani doma\u010Do mero
-
-#
-# Daily Values and Foods [1]
-#
-WEIGHT_LBL2=Te\u017Ea
-HOME_WEIGHTS_LBL=Doma\u010De mere
-WGHT_PER_AMOUNT=Te\u017Ea/Koli\u010Dina
-WEIGHT_SHORT=Te\u017Ea
-
-#
-# Selector for Daily Value [1]
-#
-MEALS_FOODS_SELECTOR_DAILY=Izbirnik \u017Eivil in obrokov za dnevni vnos
-NAME=Ime
-HOME_WEIGHT=Doma\u010De mere
-NO_ITEM_SELECTED=Elementa nimamo izbranega.
-
-#
-# Printing Food menu [2]
-#
-PRINT_FOOD_DESC=Opis hrane
-DATE=Datum
-TIME=\u010Cas
-FOOD_MENU_BASE=Preprost jedilnik (samo OH)
-FOOD_MENU_EXT_I=Raz\u0161irjen jedilnik I (OH,Ins)
-FOOD_MENU_EXT_II=Raz\u0161irjen jedilnik II (OH,Ins,KS)
-FOOD_MENU_EXT_III=Raz\u0161irjen jedilnik III (OH,Ins,KS,kJ)
-REPORT_FOOTER=To poro\u010Dilo je iz programa "GGC - GNU Gluco Control", ki je dosegljiv zastonj na doma\u010Di strani: http://ggc.sourceforge.net
-TOGETHER=Skupaj
-CH=OH
-INS=Ins
-BG=KS
-AMOUNT_SHORT=Kol.
-
-#
-# Nutrients [3]
-#
-PROCNT=Beljakovine
-FAT=Ma\u0161\u010Dobe
-CHOCDF=Ogljikovi hidrati
-ASH=Pepel
-ENERC_KCAL=Energija (kcal)
-STARCH=Starch
-SUCS=Sucrose
-GLUS=Glukoza (dextroza)
-FRUS=Fruktosa
-LACS=Laktosa
-MALS=Maltosa
-ALC=Alkohol, ethyl
-WATER=Voda
-CAFFN=Kafein
-GI=Glikemi\u010Dni Indeks
-GL=Glikemi\u010Dno Nalaganje
-GI_MIN=Glikemi\u010Dni Indeks (Min)
-GI_MAX=Glikemi\u010Dni Indeks (Max)
-GL_MIN=Glikemi\u010Dno Nalaganje (Min)
-GL_MAX=Glikemi\u010Dno Nalaganje (Max)
-ENERC_KJ=Energija (KJ)
-SUGAR=Sladkorji, skupaj
-GALS=Galactose
-FIBTG=Vlaknine
-CA=Calcium, Ca
-FE=Iron, Fe
-MG=Magnesium, Mg
-P=Phosphorus, P
-K=Potassium, K
-NA=Sodium, Na
-ZN=Zinc, Zn
-CU=Copper, Cu
-FLD=Fluoride, F
-MN=Manganese, Mn
-SE=Selenium, Se
-VITA_IU=Vitamin A, IU
-VITA_RAE=Vitamin A, RAE
-CARTB=Carotene, beta
-CARTA=Carotene, alpha
-TOCPHA=Vitamin E (alpha-tocopherol)
-VITD-=Vitamin D
-VITB6A=Vitamin B-6
-VITB12=Vitamin B-12
-VITK=Vitamin K (phylloquinone)
-FAMS=Fatty acids, total monounsaturated
-FAPU=Fatty acids, total polyunsaturated
-CHOLE=Kolesterol
-FATRN=Fatty acids, total trans
-FASAT=Fatty acids, total saturated
-FATRNM=Fatty acids, total trans-monoenoic
-FATRNP=Fatty acids, total trans-polyenoic
-
-#
-# Nutrients, not usually used [3]
-#
-FOL=Folate, total
-CHOLN=Choline, total
-THEBRN=Theobromine
-RETOL=Retinol
-CRYPX=Cryptoxanthin, beta
-LYCPN=Lycopene
-LUT+ZEA=Lutein + zeaxanthin
-TOCPHB=Tocopherol, beta
-TOCPHG=Tocopherol, gamma
-TOCPHD=Tocopherol, delta
-VITC=Vitamin C, total ascorbic acid
-THIA=Vitamin B1, Thiamin
-RIBF=Vitamin B2, Riboflavin
-NIA=Niacin
-PANTAC=Pantothenic acid
-FOLAC=Folic acid
-FOLFD=Folate, food
-FOLDFE=Folate, DFE
-BETN=Betaine
-TRP_G=Tryptophan
-THR_G=Threonine
-ILE_G=Isoleucine
-LEU_G=Leucine
-LYS_G=Lysine
-MET_G=Methionine
-CYS_G=Cystine
-PHE_G=Phenylalanine
-TYR_G=Tyrosine
-VAL_G=Valine
-ARG_G=Arginine
-HISTN_G=Histidine
-ALA_G=Alanine
-ASP_G=Aspartic acid
-GLU_G=Glutamic acid
-GLY_G=Glycine
-PRO_G=Proline
-SER_G=Serine
-HYP=Hydroxyproline
-PHYSTR=Phytosterols
-STID7=Stigmasterol
-CAMD5=Campesterol
-SITSTR=Beta-sitosterol
-
-#
-# Home Weights - Translation [2]
-#
--TO-SERVE=za serviranje
-AFTER=po
-APPROX=pribl.
-AMOUNT=kolicina xx
-AVG.=povp.
-BLOCK=kocka
-BLOCKS=kocke
-BONE=kost
-BONELESS=brez kosti
-BOTTLE=steklenica
-BAG=vrecka xx
-BAR=tablica
-BIG=velik
-BOX=skatla xx
-CAN=konzerva
-CHOPPED=sesekljano
-CHUNK=kos
-CHUNKS=kosi
-CONTAINER=embala\u017Ea
-CONTENTS=vsebina
-COOKED=kuhano
-COOKIE=keks
-COOK=kuhaj
-COOKING=kuhanje
-CRUMBLED=razdrobljeno
-CRUSHED=zme\u010Dkano
-CUBED=kockano
-CUBIC=kockast
-CUT=razrezano
-CUBE=kocka
-CUBES=kocke
-CUP=skodelica
-CUPCAKE=poti\u010Dka
-CUPS=skodelice
-CURD=skuta
-DICED=nakockano
-DASH=potreseno
-DRAINED=izsu\u0161eno
-DIA=premer
-DIA.=premer
-DIAM=premer
-DIAM.=premer
-DIAMETER=premer
-ENVELOPE=ovoj
-EXTRA=posebej
-FOR=za
-FROM=od
-FROZEN=zamr\u017Enjen
-FRUIT=sade\u017E
-FRUITS=sade\u017Ei
-FL=fl x
-FLUID=teko\u010Dina
-GROUND=zemlja
-G=g
-HIGH=visoko
-IN=v
-IN.=un\u010Da
-INCH=un\u010Da
-INSTANT=instanten
-ITEM=komad
-ITEMS=komadi
-INDIVIDUAL=posami\u010Dni
-JAR=kozarec
-JUMBO=velik
-LARGE=velik
-LEAVES=listi
-LONG=dolg
-LB=funt
-MAKE=ustvari
-MASHED=tla\u010Den
-MAKES=ustvari
-MEDIUM=srednje
-MEAT=meso
-ML=ml
-MELTED=topljen
-NOT=ne
-NET=mre\u017Ea
-OUNCE=un\u010Da
-OZ=un.
-OZ.=un.
-OR=ali
-PACK=zavitek
-PACKAGE=zavitek
-PACKET=paket
-PACKAGES=paketi
-PACKED=pakiran
-PAT=kepica
-PATTY=pa\u0161teta
-PIECE=ko\u0161\u010Dek
-PIECES=ko\u0161\u010Dki
-PKG.=pak.
-POD=strok
-PODS=stroki
-PORTION=porcija
-POWDER=pra\u0161ek
-PRODUCT=produkt
-PREPARED=pripravljen
-QUART=1/4 galone
-RAW=surov
-READY=pripravljen
-READY-TO=pripravljen za
-READY-TO-COOK=pripravljen za kuhanje
-READY-TO-EAT=pripravljen za prehrano
-READY-TO-SERVE=pripravljen za postre\u017Ebo
-RECIPE=recept
-RECONSTITUTED=obnovljen
-REFRIGATED=zamr\u017Enjen
-REFRIGERATED=zamr\u017Enjen
-REFUSE=odpad
-REGULAR=reden
-REMOVED=odstranjen
-ROLL=zavitek
-ROLLS=zavirki
-SCOOP=kepica
-SE...
[truncated message content] |
|
From: <and...@us...> - 2016-12-25 19:36:41
|
Revision: 1444
http://sourceforge.net/p/ggc/code/1444
Author: andyrozman
Date: 2016-12-25 19:36:38 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc-cgm
- Db changes
- added new Extended Type
Modified Paths:
--------------
trunk/build/build.xml
trunk/ggc-cgm/build/build.xml
trunk/ggc-core-app/ggc-core/pom.xml
trunk/ggc-core-app/ggc-doctor-core/pom.xml
trunk/ggc-core-app/pom.xml
trunk/ggc-doctor/data/db/ggc_db.trace.db
trunk/ggc-doctor-app/ggc-desktop-doctor/pom.xml
trunk/ggc-doctor-app/ggc-doctor-server/pom.xml
trunk/ggc-doctor-app/pom.xml
trunk/ggc-plugins/ggc-cgms/src/main/resources/html/cgms/minimed.html
trunk/ggc-removed/ggc-master-pom/pom.xml
trunk/ggc-support/ggc-help/pom.xml
trunk/ggc-support/pom.xml
trunk/pom.xml
Added Paths:
-----------
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesExtendedEntry.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/ExtendedCGMSValueHandler.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/ExtendedCGMSValueType.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/GGC_CGMSDb.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSAlarms.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/manager/CGMSDevicesIds.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/DataAccessCGMS.java
trunk/ggc-plugins/ggc-cgms/src/main/resources/GGC_CGMSTool_de.properties
trunk/ggc-plugins/ggc-cgms/src/main/resources/GGC_CGMSTool_en.properties
trunk/ggc-plugins/ggc-cgms/src/main/resources/GGC_CGMSTool_fr.properties
trunk/ggc-plugins/ggc-cgms/src/main/resources/GGC_CGMSTool_si.properties
trunk/ggc-plugins/ggc-cgms/src/main/resources/html/
trunk/ggc-plugins/ggc-cgms/src/main/resources/icons/
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/data/GGCTreeRootStatic.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/GGCDbCache.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/GGCDbNutri.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DAOObject.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DailyFoodEntries.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DailyFoodEntry.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodDescription.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/GlycemicNutrients.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/HomeWeightSpecial.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/Meal.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealGroup.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealNutrition.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealPart.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealParts.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/NutritionDefinition.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/NutritionHomeWeightType.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/plugin/BackupRestoreNutriHandler.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuAbstract.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuBase.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuExt1.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuExt2.java
trunk/ggc-removed/ggc-master-pom/
trunk/ggc-support/ggc-support/doc/DeployVersions.txt
Removed Paths:
-------------
trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
trunk/ggc-cgm/src/GGC_CGMSTool_en.properties
trunk/ggc-cgm/src/GGC_CGMSTool_fr.properties
trunk/ggc-cgm/src/GGC_CGMSTool_si.properties
trunk/ggc-cgm/src/ggc/
trunk/ggc-cgm/src/html/
trunk/ggc-cgm/src/icons/
trunk/ggc-master-pom/
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSValuesExtendedEntry.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/db/GGC_CGMSDb.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/defs/CGMSAlarms.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/manager/CGMSDevicesIds.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/util/DataAccessCGMS.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/data/GGCTreeRootStatic.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/GGCDbCache.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/GGCDbNutri.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DailyFoodEntries.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/DailyFoodEntry.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodDescription.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/GlycemicNutrients.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/HomeWeightSpecial.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/Meal.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealGroup.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealNutrition.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealPart.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/MealParts.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/NutritionDefinition.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/NutritionHomeWeightType.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/plugin/BackupRestoreNutriHandler.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuAbstract.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuBase.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuExt1.java
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/print/PrintFoodMenuExt2.java
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/build/build.xml 2016-12-25 19:36:38 UTC (rev 1444)
@@ -5,7 +5,7 @@
</description>
<!-- Environment properties read from a file ...-->
- <property file="../ggc-core/build/GGC_Core_Version.properties"/>
+ <property file="../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/>
<!-- These should *not* be modified on the command line! -->
@@ -38,11 +38,11 @@
<!-- Public targets -->
<target name="clean" description="clean">
- <delete>
- <fileset dir="./deploy_files">
- <include name="**"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="./deploy_files">
+ <include name="**"/>
+ </fileset>
+ </delete>
</target>
<target name="all" depends="clean, all_noclean" description="whole GGC">
@@ -65,7 +65,7 @@
<echo message=" Start GGC Core build"/>
<echo message=""/>
<subant target="deploy">
- <fileset dir="../ggc-core" includes="*/build.xml" />
+ <fileset dir="../ggc-core-app/ggc-core" includes="*/build.xml" />
</subant>
</target>
@@ -108,7 +108,7 @@
<echo message=" Start GGC Meter Plugin build"/>
<echo message=""/>
<subant target="deploy">
- <fileset dir="../ggc-meter" includes="*/build.xml" />
+ <fileset dir="../ggc-plugins/ggc-meter" includes="*/build.xml" />
</subant>
</target>
@@ -117,7 +117,7 @@
<echo message=" Start GGC Pump Plugin build"/>
<echo message=""/>
<subant target="deploy">
- <fileset dir="../ggc-pump" includes="*/build.xml" />
+ <fileset dir="../ggc-plugins/ggc-pump" includes="*/build.xml" />
</subant>
</target>
Modified: trunk/ggc-cgm/build/build.xml
===================================================================
--- trunk/ggc-cgm/build/build.xml 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-cgm/build/build.xml 2016-12-25 19:36:38 UTC (rev 1444)
@@ -54,7 +54,7 @@
</copy>
<mkdir dir="${binary.dir}/icons" />
<copy todir="${binary.dir}/icons" overwrite="true">
- <fileset dir="../src/icons" casesensitive="no">
+ <fileset dir="../../ggc-plugins/ggc-cgms/src/main/resources/icons" casesensitive="no">
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
<include name="**/*.png"/>
Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2016-12-25 19:36:38 UTC (rev 1444)
@@ -1,162 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 1.0.2 ###
-# ### Last change: 03.07.2011 14:44:12 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 63
-# Not translated: 57 (90 %)
-# Need to be checked: 0 (0 %)
-#
-# Translated: 6 (9 %)
-#
-#
-#
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# Plug-in Specific [1]
-#
-DEVICE_NAME_NORMAL=CGMS
-DEVICE_NAME_BIG=CGMS
-DEVICE_FULL_NAME_WITHOUT_PORT=%s
-DEVICE_FULL_NAME_WITH_PORT=%s on %s
-
-#
-# Menus [1]
-#
-MN_CGMS=CGMS
-MN_CGMS_READ=CGMS &auslesen
-MN_CGMS_READ_DESC=Die Daten des CGMS auslesen
-MN_CGMS_LIST=CGMS-&Liste
-MN_CGMS_LIST_DESC=Liste der verf\u00FCgbaren CGMS-Ger\u00E4te
-MN_CGMS_CONFIG=&Einstellungen
-MN_CGMS_CONFIG_DESC=Einstellungen des CGMS-Plug-ins
-MN_CGMS_ABOUT=About
-MN_CGMS_ABOUT_DESC=About CGMS Plugin (copyright, features, credits,...)
-MN_CGMS_VIEW_DATA=View Data
-MN_CGMS_VIEW_DATA_DESC=View data read from device(s)
-MN_CGMS_READ_FILE=Read file
-MN_CGMS_READ_FILE_DESC=Read data from CGMS/sw export file
-
-#
-# About [1]
-#
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-#
-# Configuration [1]
-#
-MY__=My
-NEW__=New
-DEVICE_CONFIGURATION=%s Configuration
-SELECT_X_DEVICE=Select %s Device
-SELECTED_X_DEVICE=Selected %s Device
-DEVICE_CUSTOM_NAME=%s Custom Name
-DEVICE_DOWNLOAD=DL
-DEVICE_SETTINGS=Sett.
-
-#
-# Device Selector [1]
-#
-SELECTOR_DEVICE=%s Device Selector
-
-#
-# Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-DEVICE_ICON=%s picture
-STATUS_READER_ERROR=Internal %s (or port) error
-ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-DEVICE_INFO=%s Info
-
-#
-# Download [1]
-#
-READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s]
-
-#
-# Device Configuration [1]
-#
-READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s]
-SETTING_GROUP=Setting / Group
-
-#
-# Export [1]
-#
-EXPORT_DEVICE_DATA=Export %s Data
-
-#
-# List [1]
-#
-DEVICE_LIST_WEB=CGMS List
-DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
-
-#
-# CGMS companies descriptions [1]
-#
-
-#
-# CGMS Instructions [1]
-#
-
-#
-# Manual Entry [1]
-#
-AVG_BG=Avg BG
-BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS)
-BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration)
-AVG=Avg
-TOTAL=Total
-LOWEST=Lowest
-STD_DEV=Std Dev
-READINGS=Readings
-HIGHEST=Highest
-SUM=Sum
-READING=Reading
-CGMS_DAILY_OVERVIEW=CGMS Daily Stats
-
-# table
-ENTRY_TYPE=Entry Type
-COMMENT=Comment
-
-# types
-ENTRY_BG_READING=Reading
-ENTRY_BG_CALIBRATION=Calibration
-
-#
-# Devices [1]
-#
-
-#
-# Backup/Restore [1]
-#
-CGMS_TOOL=CGMS Tool
-CGMS_DATA=CGMS Data
-CGMS_DATA_EXTENDED=CGMS Data Extended
-
-#
-# Types [1]
-#
-CGMS_READINGS=CGMS Readings
-CALIBRATION_READINGS=Calibration
-CGMS_READING=CGMS Reading
-
-#
-# Meter Instructions [1]
-#
-INSTRUCTIONS_DEXCOM=<html>Instructions for CGMS reading:<br><ul><li>We currently support only import of Dexcom 3<br>application export files (TXT or XML).</li><li>Reading from device, might or might not be<br>supported in future (depending on company <br>support).</li><li>Select correct file and file type in next<br>screens and import will start.</li></ul></html>
Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_en.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_en.properties 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_en.properties 2016-12-25 19:36:38 UTC (rev 1444)
@@ -1,336 +0,0 @@
-#
-# !MASTER_FILE!
-# !S! MODULE=GGC CGMS Tool
-# !S! MODULE_VERSION=1.0.2
-#
-# ######################################################################
-# ### GGC CGMS Tool ###
-# ######################################################################
-# ### Language: English ###
-# ### Created by: Andy Rozman (an...@at...) ###
-# ### Last change: 4th April 2015 ###
-# ### Library Version: 1.0.2 ###
-# ### Application Version: 0.5 ###
-# ######################################################################
-#
-# Please use this file as default language file. Do not try to translate
-# from any other files, since this is the Master language file. Create the
-# same header and specify application version number for easier changes at
-# later time.
-# Translations should be grouped by groups as specified here.
-# Older groups are done by packages, newer by logical name.
-
-#
-# In brackets there are now tags which define urgency of some text beeing translated
-# !S! GROUP_PRIORITY_1=Needed, urgent (Base functionality, options which will be used by user mostly)
-# !S! GROUP_PRIORITY_2=Needed
-# !S! GROUP_PRIORITY_3=Not used yet (in public releases)
-# !S! GROUP_PRIORITY_4=In implementation
-#
-
-
-#
-# !G! Plug-in Specific [1]
-#
-DEVICE_NAME_NORMAL=CGMS
-DEVICE_NAME_BIG=CGMS
-DEVICE_FULL_NAME_WITHOUT_PORT=%s
-DEVICE_FULL_NAME_WITH_PORT=%s on %s
-
-#
-# !G! Menus [1]
-#
-MN_CGMS=CGMS
-MN_CGMS_READ=Read data
-MN_CGMS_READ_DESC=Reading data from CGMS
-
-MN_CGMS_READ_CONFIG=Read configuration
-MN_CGMS_READ_CONFIG_DESC=Read configuration from CGMS
-
-
-MN_CGMS_LIST=CGMS List
-MN_CGMS_LIST_DESC=List of available CGMS devices
-MN_CGMS_CONFIG=Configure
-MN_CGMS_CONFIG_DESC=Configuration of CGMS plug-in
-MN_CGMS_ABOUT=About
-MN_CGMS_ABOUT_DESC=About CGMS Plugin (copyright, features, credits,...)
-MN_CGMS_VIEW_DATA=View Data
-MN_CGMS_VIEW_DATA_DESC=View data read from device(s)
-MN_CGMS_READ_FILE=Read file
-MN_CGMS_READ_FILE_DESC=Read data from CGMS/sw export file
-
-MN_CGMS_GRAPH_DESC=Graphs for CGMS Plugin
-#MN_DAILY_GRAPH=Daily CGMS Graph
-#MN_DAILY_GRAPH_DESC=Daily CGMS Graph
-
-#MN_WEEKLY_GRAPH=Weekly CGMS Graph
-#MN_WEEKLY_GRAPH_DESC=Weekly CGMS Graph
-
-#
-# !G! About [1]
-#
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-
-
-#
-# !G! Configuration [1]
-#
-MY__=My
-NEW__=New
-DEVICE_CONFIGURATION=%s Configuration
-SELECT_X_DEVICE=Select %s Device
-SELECTED_X_DEVICE=Selected %s Device
-DEVICE_CUSTOM_NAME=%s Custom Name
-
-DEVICE_DOWNLOAD=DL
-DEVICE_SETTINGS=Sett.
-
-
-#
-# !G! Device Selector [1]
-#
-SELECTOR_DEVICE=%s Device Selector
-
-
-#
-# !G! Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-DEVICE_ICON=%s picture
-STATUS_READER_ERROR=Internal %s (or port) error
-ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-DEVICE_INFO=%s Info
-
-
-#
-# !G! Download [1]
-#
-READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s]
-
-
-#
-# !G! Device Configuration [1]
-#
-READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s]
-SETTING_GROUP=Setting / Group
-
-
-#
-# !G! Export [1]
-#
-EXPORT_DEVICE_DATA=Export %s Data
-
-
-#
-# !G! List [1]
-#
-DEVICE_LIST_WEB=CGMS List
-DEVICE_LIST_WEB_DESC=<html>CGMS list contains most of CGMS (even most of models). For each of this CGMS, there is configuration entry, which contains some basic settings for device. Devices which support download have that shown in selector (DL column). CGMSes in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
-
-
-#
-# !G! CGMS companies descriptions [1]
-#
-#MINIMED_DESC=We got partitial support from company and implementation will start in December 2008.
-
-
-#
-# !G! CGMS Instructions [1]
-#
-INSTRUCTIONS_DEXCOM=<html>Instructions for CGMS reading:<br><ul><li>We currently support only import of Dexcom 3<br>application export files (TXT or XML).</li><li>Reading from device, might or might not be<br>supported in future (depending on company <br>support).</li><li>Select correct file and file type in next<br>screens and import will start.</li></ul></html>
-DEXCOM_INSTRUCTIONS_DL_SERIAL_USB=<html>Instructions for CGMS reading:<br><li>Attach Dexcom device to computer via USB.</li><li>Click on "Start Download"</li></html>
-
-
-#
-# !G! Manual Entry [1]
-#
-AVG_BG=Avg BG
-BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS)
-BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration)
-AVG=Avg
-TOTAL=Total
-LOWEST=Lowest
-STD_DEV=Std Dev
-READINGS=Readings
-HIGHEST=Highest
-SUM=Sum
-READING=Reading
-CGMS_DAILY_OVERVIEW=CGMS Daily Stats
-
-# !SG! table
-ENTRY_TYPE=Entry Type
-COMMENT=Comment
-
-# !SG! types
-ENTRY_BG_READING=Reading
-ENTRY_BG_CALIBRATION=Calibration
-
-
-#
-# !G! Devices [1]
-#
-
-#
-# !G! Backup/Restore [1]
-#
-CGMS_TOOL=CGMS Tool
-CGMS_DATA=CGMS Data
-CGMS_DATA_EXTENDED=CGMS Data Extended
-
-
-#
-# !G! Types [1]
-#
-CGMS_READINGS=CGMS Readings
-CALIBRATION_READINGS=Calibration
-CGMS_READING=CGMS Reading
-CGMS_DATA_EVENT=Event
-CGMS_DATA_ALARM=Alarm
-CGMS_DATA_ERROR=Error
-CGMS_READING_TREND=Trend
-CGMS_TRANSMITER_EVENT=Transmiter Event
-
-#
-# !G! CGMS Extended Types
-#
-CGMS_EXT_CARBS=Carbs
-CGMS_EXT_INSULIN=Insulin
-CGMS_EXT_HEALTH=Health
-CGMS_EXT_EXERCISE=Exercise
-HEALTH_DESCRIPTION=Health - %s
-
-
-#
-# !G! CGMS Events [2]
-#
-EVENT_CONTROLLER_POWER_DOWN=Controller Power Down
-EVENT_CONTROLLER_POWER_UP=Controller Power Down
-EVENT_SENSOR_CONNECTION_LOST=Sensor Connection Lost
-EVENT_START_SENSOR=Start Sensor
-EVENT_STOP_SENSOR=End Sensor
-EVENT_CALIBRATION_WITH_METER=Calibration With Meter
-EVENT_WAITING_FOR_CALIBRATION=Waiting for Calibration
-EVENT_SET_CALIBRATION_FACTOR=Set Calibration Factor
-EVENT_SENSOR_PRE_INIT=Sensor Pre-Init
-EVENT_SENSOR_INIT=Sensor Init
-EVENT_SENSOR_BURST=Sensor Burst
-EVENT_SENSOR_WEAK_SIGNAL=Sensor Weak Signal
-EVENT_SENSOR_LOW_BG=Sensor Low BG
-EVENT_SENSOR_CALIBRATION_WITH_METER_NOW=Sensor Calibration With Meter Now
-
-
-#
-# !G! CGMS Errors [2]
-#
-ERROR_SENSOR_CALIB_ERROR=Sensor Calibration Error
-ERROR_SENSOR_END_OF_LIFE=Sensor End Of Life
-ERROR_SENSOR_BAD=Sensor Bad
-
-#
-# !G! CGMS Alarms [2]
-#
-ALARM_CALIBRATION_REQUIRED=Sensor Calibration Required
-ALARM_WEAK_SIGNAL=Sensor Weak Signal
-ALARM_SENSOR_ALARM=Sensor Alarm
-ALARM_CALIBRATION_ERROR=Calibration Error
-ALARM_SENSOR_END_OF_LIFE=Sensor End Of Life approaching
-ALARM_SENSOR_END_OF_LIFE_DESC=Sensor End Of Life approaching - %s
-ALARM_SENSOR_ERROR=Sensor Error
-ALARM_SENSOR_CHANGE_REQUIRED=Sensor Change Required
-ALARM_SENSOR_SIGNAL_LOST=Sensor Signal Lost
-ALARM_HIGH_GLUCOSE_PREDICTED=High Glucose Predicted
-ALARM_LOW_GLUCOSE_PREDICTED=Low Glucose Predicted
-ALARM_HIGH_GLUCOSE=High Glucose
-ALARM_LOW_GLUCOSE=Low Glucose
-
-
-#
-# Dexcom
-#
-
-
-
-
-
- ParsingError("DXC_PARSING_ERROR"), //
- ParsingErrorUnsupportedDataLenth("DXC_PARSING_ERROR_UNSUPP_DATA_LENGTH"), //
- Receiver_ErrorWritingToReceiver("DXC_RECEIVER_ERROR_WRITING"), //
- Parsing_BytesParsingError("DXC_BYTES_PARSING_ERROR"), //
- FailedCRCCheck("DXC_FAILED_CRC_CHECK"), //
- UnsupportedTypeOfParametersForCommand("DXC_UNSUPPORTED_TYPE_OF_PARAMS_FOR_CMD"), //
- UnsupportedReceiver("DXC_UNSUPPORTED_RECEIVER"), DownloadCanceledByUser("STATUS_STOPPED_USER"), DeviceNotFoundOnConfiguredPort(
- "DEVICE_NOT_FOUND_ON_CONFIGURED_PORT"), DevicePortInUse("DEVICE_PORT_IN_USE"),
-
-
-#
-# !G! CGMS Configuration [2]
-#
-
-# !SG! Groups
-GROUP_TRANSMITER=Transmiter
-GROUP_WARNINGS=Warnings
-
-# !SG! Sounds
-
-PCFG_SOUND_HIGH_ALERT=High Alert
-PCFG_SOUND_LOW_ALERT=Low Alert
-PCFG_SOUND_RISE_RATE=Rise Rate
-PCFG_SOUND_FALL_RATE=Fall Rate
-PCFG_SOUND_RANGE=Range
-PCFG_SOUND_OTHER=Other
-PCFG_SOUND_TRANSMITEROUT_OF_RANGE=Out of Range
-CCFG_X_WARNING_ABOVE=%s Warning Above
-CCFG_X_WARNING_BELOW=%s Warning Below
-CCFG_X_SNOOZE_TIME=%s Snooze Time
-
-
-# !SG! Sensor
-CCFG_X_ENABLED=%s Enabled
-CCFG_X_LIMIT_ENABLED=%s Limit Enabled
-CCFG_TRANSMITER_SERIAL_NUMBER=Serial Number
-
-CCFG_SENSOR_ENABLED=Sensor Enabled
-CCFG_SENSOR_BG_UNITS=Sensor BG Units
-CCFG_SENSOR_CALIBRATION_REMINDER_ENABLE=Sensor Calibration Reminder Enable
-CCFG_SENSOR_CALIBRATION_REMINDER_TIME=Sensor Calibration Reminder Time
-CCFG_SENSOR_TRANSMITER_ID=Sensor Transmiter ID
-CCFG_SENSOR_WEAK_SIGNAL_TIME=Sensor Weak Signal Time
-CCFG_SENSOR_ALARM_SNOOZE_TIME=Sensor Alarm Snooze Time
-CCFG_SENSOR_DEMO_ENABLE=Sensor Demo Enable
-CCFG_SENSOR_GRAPH_TIMEOUT=Sensor Graph Timeout
-CCFG_SENSOR_TIME_SENSITIVITY_LOW_PREDICTIVE_ALERT=Time Sensitivity - Low Predictive Alert
-CCFG_SENSOR_TIME_SENSITIVITY_HIGH_PREDICTIVE_ALERT=Time Sensitivity - High Predictive Alert
-CCFG_OPTION_OFF=Off
-CCFG_SENSOR_ALERT_SILENCE_TYPE=Alert Silence Type
-CCFG_SENSOR_ALERT_SILENCE_HI_ALERTS=High Alerts
-CCFG_SENSOR_ALERT_SILENCE_LO_ALERTS=Low Alerts
-CCFG_SENSOR_ALERT_SILENCE_HI_LO_ALERTS=High/Low Alerts
-CCFG_SENSOR_ALERT_SILENCE_ALL_SENSOR_ALERTS=All Sensor Alerts
-CCFG_SENSOR_ALERT_SILENCE_TIME=Alert Silence Time
-CCFG_SENSOR_AUTOCALIBRATE=Sensor Autocalibrate
-CCFG_SENSOR_LOW_BG_SUSPEND=Sensor Low BG Suspend
-CCFG_SENSOR_CALIBRATION_REPEAT_TIME=Calibration Repeat Time
-CCFG_SENSOR_BG_LIMITS_ENABLED=BG Limits Enabled
-CCFG_SENSOR_BG_LIMIT=BG Limit
-
-CCFG_RATE_OF_CHANGE_ALERTS_RISE_RATE_LIMIT=Change Alert - Rise Rate Limit
-CCFG_RATE_OF_CHANGE_ALERTS_FALL_RATE_LIMIT=Change Alert - Fall Rate Limit
-
-
-
-
-
-
-
-#
-# !G! Graphs
-#
-CGMS_DAILY_GRAPH=CGMS Daily Graph
-CGMS_DAILY_GRAPH_DESC=CGMS Daily Graph
-CGMS_WEEKLY_GRAPH=CGMS Weekly Graph
-CGMS_WEEKLY_GRAPH_DESC=CGMS Weekly Graph
-GRAPH_CLOSE=Close
-HELP=Help
Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_fr.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_fr.properties 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_fr.properties 2016-12-25 19:36:38 UTC (rev 1444)
@@ -1,210 +0,0 @@
-# ######################################################################
-# ### GGC CGMS Tool ###
-# ######################################################################
-# ### Language: French ###
-# ### Created by: Andy Rozman (an...@at...) ###
-# ### Last change: 4th February 2010 ###
-# ### Library Version: 0.4.3 ###
-# ### Application Version: 0.4.17 ###
-# ######################################################################
-#
-# In brackets there are now tags which define urgency of some text beeing translated
-# 1 - Needed, urgent (Base functionality, options which will be used by user mostly)
-# 2 - Needed
-# 3 - Not used yet (in public releases)
-# 4 - In implementation
-#
-# * - If tags also has *, then it means that this string can change regulary, last update is in []
-#
-
-
-#
-# Plug-in Specific (1)
-# Most of strings here are concated with help of sprintf codes, so almost all are static
-#
-DEVICE_NAME_NORMAL=CGMS
-DEVICE_NAME_BIG=CGMS
-DEVICE_FULL_NAME_WITHOUT_PORT=%s
-DEVICE_FULL_NAME_WITH_PORT=%s on %s
-
-#
-# Menus
-#
-MN_CGMS=CGMS
-MN_CGMS_READ=CGMS Read
-MN_CGMS_READ_DESC=Reading data from CGMS
-MN_CGMS_LIST=CGMS List
-MN_CGMS_LIST_DESC=List of available CGMS devices
-MN_CGMS_CONFIG=Configure
-MN_CGMS_CONFIG_DESC=Configuration of CGMS plug-in
-MN_CGMS_ABOUT=About
-MN_CGMS_ABOUT_DESC=About CGMS Plugin (copyright, features, credits,...)
-MN_CGMS_VIEW_DATA=View Data
-MN_CGMS_VIEW_DATA_DESC=View data read from device(s)
-
-
-#
-# About (1)
-# Note: elements under static are same for all plugins and non-static are plugin specific
-#
-
-# static
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-
-
-#
-# Configuration (1)
-#
-MY__=My
-NEW__=New
-DEVICE_CONFIGURATION=%s Configuration
-SELECT_X_DEVICE=Select %s Device
-SELECTED_X_DEVICE=Selected %s Device
-DEVICE_CUSTOM_NAME=%s Custom Name
-
-DEVICE_DOWNLOAD=DL
-DEVICE_SETTINGS=Sett.
-
-
-#
-# Device Selector (1)
-#
-SELECTOR_DEVICE=%s Device Selector
-
-
-
-
-
-
-#
-# Instructions Dialog ((1))
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-DEVICE_ICON=%s picture
-STATUS_READER_ERROR=Internal %s (or port) error
-
-ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-DEVICE_INFO=%s Info
-
-
-#
-# Download
-#
-
-READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s]
-
-
-#
-# Device Configuration (1)
-#
-READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s]
-SETTING_GROUP=Setting / Group
-
-
-#
-# Export (1)
-#
-EXPORT_DEVICE_DATA=Export %s Data
-
-
-#
-# List (1)
-#
-DEVICE_LIST_WEB=CGMS List
-
-## TO DO
-# non-static
-DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
-
-
-
-#
-# CGMS companies desc. (this is not description of company, but about our connection with company) (3*)
-# [12.10.2008]
-#
-MINIMED_DESC=We got partitial support from company and implementation will start in December 2008.
-
-
-#
-# CGMS Instructions (1)
-# []
-#
-
-
-#
-# Manual Entry (1)
-#
-AVG_BG=Avg BG
-BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS)
-BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration)
-AVG=Avg
-TOTAL=Total
-LOWEST=Lowest
-STD_DEV=Std Dev
-READINGS=Readings
-HIGHEST=Highest
-SUM=Sum
-READING=Reading
-CGMS_DAILY_OVERVIEW=CGMS Daily Stats
-
-# table
-ENTRY_TYPE=Entry Type
-COMMENT=Comment
-
-# types
-ENTRY_BG_READING=Reading
-ENTRY_BG_CALIBRATION=Calibration
-
-
-#
-# Devices
-#
-
-#
-# Backup/Restore
-#
-CGMS_TOOL=CGMS Tool
-CGMS_DATA=CGMS Data
-
-
-#
-# Printing - Plugin specific (2)
-#
-#MN_PUMP=Pump
-#MN_PUMP_PRINT_DESC=Report for Pumps Data
-#MN_PUMP_PRINT_SIMPLE=Simple
-#MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data
-#MN_PUMP_PRINT_EXT=Extended
-#MN_PUMP_PRINT_SIMPLE_DESC=Extended Report for Pump data (Simple + Foods)
-#VALUE_SHORT=Value
-#OTHER_DATA=Other Data
-#OTHER_DATA_FOOD=Other Data (with Food)
-#PUMP_DATA_BASE=Simple Pump Report
-#PUMP_DATA_EXT=Extended Pump Report
-
-#FOOD_DB_PRINT=Food (Db)
-#FOOD_DESC_PRINT=Food (Desc.)
-
-#FOOD_DESC_PRINT_NOT_YET=Display of Food Db data not implemented yet!
-
-
-
-#
-# Types
-
-CGMS_READINGS=CGMS Readings
-CALIBRATION_READINGS=Calibration
-
-CGMS_READING=CGMS Reading
-
-
-
-
-#
-# New Keywords (they are grouped), this need to be copied to right locations, after release
-#
-
-
Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_si.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_si.properties 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_si.properties 2016-12-25 19:36:38 UTC (rev 1444)
@@ -1,162 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: Sloevene ###
-# ### Created by: Andy (an...@t-...) ###
-# ### Version: 1.0.2 ###
-# ### Last change: 7.7.2013 18:34:55 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 63
-# Not translated: 0 (0 %)
-# Need to be checked: 0 (0 %)
-#
-# Translated: 63 (100 %)
-#
-#
-# This comment will be displayed after header
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< a,A < b,B < c,C < \u010D,\u010C < d,D < e,E < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O < p,P < q,Q < r,R < s,S < \u0161,\u0160 < t,T < u,U < v,V < w,W < x,X < y,Y < z,Z < \u017E,\u017D
-
-#
-# Plug-in Specific [1]
-#
-DEVICE_NAME_NORMAL=CGMS
-DEVICE_NAME_BIG=CGMS
-DEVICE_FULL_NAME_WITHOUT_PORT=%s
-DEVICE_FULL_NAME_WITH_PORT=%s na %s
-
-#
-# Menus [1]
-#
-MN_CGMS=CGMS
-MN_CGMS_READ=Beri podatke
-MN_CGMS_READ_DESC=Branje podatkov iz CGMS naprave
-MN_CGMS_LIST=Seznam CGMSov
-MN_CGMS_LIST_DESC=Seznam ve\u010Dine dostopnih CGMS naprav
-MN_CGMS_CONFIG=Nastavitve CGMSja
-MN_CGMS_CONFIG_DESC=Nastavitve plug-ina za CGMSje
-MN_CGMS_ABOUT=O dodatku
-MN_CGMS_ABOUT_DESC=O dodatku za CGMSe (pravice, zmo\u017Enosti, ...)
-MN_CGMS_VIEW_DATA=Pregled podatkov
-MN_CGMS_VIEW_DATA_DESC=Preglej podatke iz naprav(e)
-MN_CGMS_READ_FILE=Beri datoteko
-MN_CGMS_READ_FILE_DESC=Beri podatke iz CGMS/sw izvozne datoteke
-
-#
-# About [1]
-#
-DEVICE_PLUGIN=Dodatek za CGMSe
-DEVICE_PLUGIN_ABOUT=O dodatku za CGMSe
-
-#
-# Configuration [1]
-#
-MY__=Moj
-NEW__=Nov
-DEVICE_CONFIGURATION=Konfiguracija CGMSa
-SELECT_X_DEVICE=Izberi CGMS
-SELECTED_X_DEVICE=Izbran CGMS
-DEVICE_CUSTOM_NAME=Doma\u010De ime CGMSa
-DEVICE_DOWNLOAD=DL
-DEVICE_SETTINGS=Nast.
-
-#
-# Device Selector [1]
-#
-SELECTOR_DEVICE=Izbirnik za CGMSe
-
-#
-# Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Ups! Pozabili ste nastaviti svojo \u010Drpalko\nin trenutno ni nobene nastavljene\nin/ali izbrane. Obi\u0161cite konfiguracijo\nin nastavite va\u0161o \u010Drpalko.\n
-CONFIGURED_DEVICE_INSTRUCTIONS=Nastavljen CGMS in navodila
-DEVICE_ICON=Slika CGMSa
-STATUS_READER_ERROR=Interna napaka na CGMSu (ali portu)
-ERROR_CONTACTING_DEVICE=Imeli smo problem pri kontaktiranju \u010Drpalke.\nProsim preverite nastavitve komunikacijskih vrat\n(nekateri kabli lahko spremenijo vrata, ko\njih znova priklju\u010Dimo). Za\u017Eenite konfiguracijo\nin problem bo verjetno re\u0161en.\n
-DEVICE_INFO=Podatki o CGMSu
-
-#
-# Download [1]
-#
-READ_DEVICE_DATA_TITLE=Beri podatke iz CGMSa [%s na %s]
-
-#
-# Device Configuration [1]
-#
-READ_DEVICE_CONFIG_TITLE=Beri CGMS nastavitve [%s na %s]
-SETTING_GROUP=Nastavitev / Skupina
-
-#
-# Export [1]
-#
-EXPORT_DEVICE_DATA=Izvozi podatke %s
-
-#
-# List [1]
-#
-DEVICE_LIST_WEB=Seznam CGMSov
-DEVICE_LIST_WEB_DESC=<html>Seznam CGMSov vsebuje ve\u010Dino CGMSov (tudi modelov). Za vsakega od teh CGMSov imamo konfiguracijske vnose, kjer so prikazane osnovne nastavitve za napravo. Naprave, ki podpirajo prenos podatkov bodo prikazane v izbirniku (DL stolpec). CGMSi v seznamu so barvno kodirani in barva dolo\u010Da status naprav dolo\u010Denega podjetja. Legenda za barvno kodiranje je na spodnjem delu te strani.<br><html>
-
-#
-# CGMS companies descriptions [1]
-#
-
-#
-# CGMS Instructions [1]
-#
-
-#
-# Manual Entry [1]
-#
-AVG_BG=Povp KS
-BLOOD_GLUCOSE_CGMS=Krvni sladkor (CGMS)
-BLOOD_GLUCOSE_CALIB=Krvni sladkor (kalibracija)
-AVG=Povp
-TOTAL=Skupaj
-LOWEST=Najni\u017Eje
-STD_DEV=Std Dev
-READINGS=Prebrano
-HIGHEST=Najvi\u0161ja
-SUM=Vsota
-READING=Vnos
-CGMS_DAILY_OVERVIEW=CGMS dnevna statistika
-
-# table
-ENTRY_TYPE=Tip vnosa
-COMMENT=Komentar
-
-# types
-ENTRY_BG_READING=Vnos
-ENTRY_BG_CALIBRATION=Kalibracija
-
-#
-# Devices [1]
-#
-
-#
-# Backup/Restore [1]
-#
-CGMS_TOOL=CGMS orodje
-CGMS_DATA=CGMS podatki
-CGMS_DATA_EXTENDED=CGMS podatki raz\u0161irjeni
-
-#
-# Types [1]
-#
-CGMS_READINGS=CGMS vnosi
-CALIBRATION_READINGS=Kalibracija
-CGMS_READING=CGMS vnosi
-
-#
-# Meter Instructions [1]
-#
-INSTRUCTIONS_DEXCOM=<html>Navodila za branje CGMSa:<br><ul><li>Trenutno podpiramo samo izvoze Dexcom 3<br>aplikacije (TXT ali XML).</li><li>Direktno branje iz naprave, bo ali pa ne bo<br>podprto v prihodnosti (odvisno od podpore iz<br>strani podjetja).</li><li>Izberite pravilno datoteko in tip datoteke<br>\nna naslednjem ekranu in uvoz se bo za\u010Del.</li></ul></html>
Modified: trunk/ggc-core-app/ggc-core/pom.xml
===================================================================
--- trunk/ggc-core-app/ggc-core/pom.xml 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-core-app/ggc-core/pom.xml 2016-12-25 19:36:38 UTC (rev 1444)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>GGC Core</name>
+ <name>GGC Core - Desktop</name>
<artifactId>ggc-core</artifactId>
<version>${ggc-core.version}</version>
Modified: trunk/ggc-core-app/ggc-doctor-core/pom.xml
===================================================================
--- trunk/ggc-core-app/ggc-doctor-core/pom.xml 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-core-app/ggc-doctor-core/pom.xml 2016-12-25 19:36:38 UTC (rev 1444)
@@ -8,10 +8,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>GGC Core Doctor</name>
+ <name>GGC Core - Doctor</name>
<description>GGC Core for Doctors Edition (mostly just customizations of ggc-core)</description>
- <artifactId>ggc-core-doctor</artifactId>
- <version>${ggc-core-doctor.version}</version>
+ <artifactId>ggc-doctor-core</artifactId>
+ <version>${ggc-doctor-core.version}</version>
Modified: trunk/ggc-core-app/pom.xml
===================================================================
--- trunk/ggc-core-app/pom.xml 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-core-app/pom.xml 2016-12-25 19:36:38 UTC (rev 1444)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>GGC Core App</name>
+ <name>GGC Core</name>
<artifactId>ggc-core-app</artifactId>
<packaging>pom</packaging>
Modified: trunk/ggc-doctor/data/db/ggc_db.trace.db
===================================================================
--- trunk/ggc-doctor/data/db/ggc_db.trace.db 2016-12-25 19:28:24 UTC (rev 1443)
+++ trunk/ggc-doctor/data/db/ggc_db.trace.db 2016-12-25 19:36:38 UTC (rev 1444)
@@ -1,5 +1,5 @@
04-15 23:26:35 jdbc[3]: SQLException
-org.h2.jdbc.JdbcSQLException: Table DOC_APPOINTMENT not found; SQL statement:
+org.h2.jdbc.JdbcSQLException: Table DOC_APPOINTMENT not found; SQL statement:
alter table doc_appointment drop constraint FKC88D2B18668FC540 [42102-69]
at org.h2.message.Message.getSQLException(Message.java:91)
at org.h2.message.Message.getSQLException(Message.java:95)
@@ -25,7 +25,7 @@
at ggc.core.db.tool.InitDb.<init>(InitDb.java:63)
at ggc.core.db.tool.InitDb.main(InitDb.java:1045)
04-15 23:26:35 jdbc[3]: SQLException
-org.h2.jdbc.JdbcSQLException: Table DOC_DOCTORS not found; SQL statement:
+org.h2.jdbc.JdbcSQLException: Table DOC_DOCTORS not found; SQL statement:
alter table doc_doctors drop constraint FK6537072DFA9399E1 [42102-69]
at org.h2.message.Message.getSQLException(Message.java:91)
at org.h2.message.Message.getSQLException(Message.java:95)
@@ -1481,167 +1481,167 @@
at java.awt.EventDispatchThread.pumpEvents(Unknown Source)
at java.awt.EventDispatchThread.pumpEvents(Unknown Source)
at java.awt.EventDispatchThread.run(Unknown Source)
-08-20 15:34:59 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
-org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
- at org.h2.message.Message.getSQLException(Message.java:91)
- at org.h2.message.Message.getSQLException(Message.java:95)
- at org.h2.message.Message.getSQLException(Message.java:73)
- at org.h2.store.FileLock.error(FileLock.java:316)
- at org.h2.store.FileLock.lockFile(FileLock.java:178)
- at org.h2.store.FileLock.lock(FileLock.java:74)
- at org.h2.engine.Database.open(Database.java:467)
- at org.h2.engine.Database.<init>(Database.java:203)
- at org.h2.engine.Engine.openSession(Engine.java:55)
- at org.h2.engine.Engine.getSession(Engine.java:104)
- at org.h2.engine.Session.createSession(Session.java:203)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
- at org.h2.Driver.connect(Driver.java:57)
- at java.sql.DriverManager.getConnection(DriverManager.java:582)
- at java.sql.DriverManager.getConnection(DriverManager.java:154)
- at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
- at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72)
- at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881)
- at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174)
- at com.atech.db.hibernate.HibernateConfiguration.createSessionFactory(HibernateConfiguration.java:250)
- at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:198)
- at ggc.core.db.GGCDb.initDb(GGCDb.java:177)
- at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:123)
-08-20 15:35:03 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
-org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
- at org.h2.message.Message.getSQLException(Message.java:91)
- at org.h2.message.Message.getSQLException(Message.java:95)
- at org.h2.message.Message.getSQLException(Message.java:73)
- at org.h2.store.FileLock.error(FileLock.java:316)
- at org.h2.store.FileLock.lockFile(FileLock.java:178)
- at org.h2.store.FileLock.lock(FileLock.java:74)
- at org.h2.engine.Database.open(Database.java:467)
- at org.h2.engine.Database.<init>(Database.java:203)
- at org.h2.engine.Engine.openSession(Engine.java:55)
- at org.h2.engine.Engine.getSession(Engine.java:104)
- at org.h2.engine.Session.createSession(Session.java:203)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
- at org.h2.Driver.connect(Driver.java:57)
- at java.sql.DriverManager.getConnection(DriverManager.java:582)
- at java.sql.DriverManager.getConnection(DriverManager.java:154)
- at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
- at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
- at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
- at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
- at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
- at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
- at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
- at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
- at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
- at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
- at ggc.core.db.GGCDb.loadColorSchemes(GGCDb.java:801)
- at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:733)
- at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:130)
-08-20 15:35:05 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
-org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
- at org.h2.message.Message.getSQLException(Message.java:91)
- at org.h2.message.Message.getSQLException(Message.java:95)
- at org.h2.message.Message.getSQLException(Message.java:73)
- at org.h2.store.FileLock.error(FileLock.java:316)
- at org.h2.store.FileLock.lockFile(FileLock.java:178)
- at org.h2.store.FileLock.lock(FileLock.java:74)
- at org.h2.engine.Database.open(Database.java:467)
- at org.h2.engine.Database.<init>(Database.java:203)
- at org.h2.engine.Engine.openSession(Engine.java:55)
- at org.h2.engine.Engine.getSession(Engine.java:104)
- at org.h2.engine.Session.createSession(Session.java:203)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
- at org.h2.Driver.connect(Driver.java:57)
- at java.sql.DriverManager.getConnection(DriverManager.java:582)
- at java.sql.DriverManager.getConnection(DriverManager.java:154)
- at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
- at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
- at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
- at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
- at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
- at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
- at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
- at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
- at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
- at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
- at ggc.core.db.GGCDb.loadConfigDataEntries(GGCDb.java:761)
- at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:736)
- at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:130)
-08-20 15:35:07 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
-org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
- at org.h2.message.Message.getSQLException(Message.java:91)
- at org.h2.message.Message.getSQLException(Message.java:95)
- at org.h2.message.Message.getSQLException(Message.java:73)
- at org.h2.store.FileLock.error(FileLock.java:316)
- at org.h2.store.FileLock.lockFile(FileLock.java:178)
- at org.h2.store.FileLock.lock(FileLock.java:74)
- at org.h2.engine.Database.open(Database.java:467)
- at org.h2.engine.Database.<init>(Database.java:203)
- at org.h2.engine.Engine.openSession(Engine.java:55)
- at org.h2.engine.Engine.getSession(Engine.java:104)
- at org.h2.engine.Session.createSession(Session.java:203)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
- at org.h2.Driver.connect(Driver.java:57)
- at java.sql.DriverManager.getConnection(DriverManager.java:582)
- at java.sql.DriverManager.getConnection(DriverManager.java:154)
- at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
- at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
- at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
- at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
- at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
- at org.hibernate.loader.Loader.doQuery(Loader.java:661)
- at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224)
- at org.hibernate.loader.Loader.doList(Loader.java:2145)
- at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029)
- at org.hibernate.loader.Loader.list(Loader.java:2024)
- at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375)
- at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308)
- at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153)
- at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106)
- at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79)
- at ggc.core.db.GGCDb.loadHbA1c(GGCDb.java:1194)
- at ggc.core.db.GGCDb.getHbA1c(GGCDb.java:1157)
- at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1129)
- at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:138)
-08-20 15:35:09 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
-org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
- at org.h2.message.Message.getSQLException(Message.java:91)
- at org.h2.message.Message.getSQLException(Message.java:95)
- at org.h2.message.Message.getSQLException(Message.java:73)
- at org.h2.store.FileLock.error(FileLock.java:316)
- at org.h2.store.FileLock.lockFile(FileLock.java:178)
- at org.h2.store.FileLock.lock(FileLock.java:74)
- at org.h2.engine.Database.open(Database.java:467)
- at org.h2.engine.Database.<init>(Database.java:203)
- at org.h2.engine.Engine.openSession(Engine.java:55)
- at org.h2.engine.Engine.getSession(Engine.java:104)
- at org.h2.engine.Session.createSession(Session.java:203)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
- at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
- at org.h2.Driver.connect(Driver.java:57)
- at java.sql.DriverManager.getConnection(DriverManager.java:582)
- at java.sql.DriverManager.getConnection(DriverManager.java:154)
- at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
- at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
- at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
- at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
- at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
- at org.hibernate.loader.Loader.doQuery(Loader.java:661)
- at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224)
- at org.hibernate.loader.Loader.doList(Loader.java:2145)
- at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029)
- at org.hibernate.loader.Loader.list(Loader.java:2024)
- at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375)
- at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308)
- at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153)
- at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106)
- at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79)
- at ggc.core.db.GGCDb.getDayStats(GGCDb.java:1237)
- at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1130)
- at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:138)
+08-20 15:34:59 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(DriverManager.java:582)
+ at java.sql.DriverManager.getConnection(DriverManager.java:154)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72)
+ at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881)
+ at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174)
+ at com.atech.db.hibernate.HibernateConfiguration.createSessionFactory(HibernateConfiguration.java:250)
+ at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:198)
+ at ggc.core.db.GGCDb.initDb(GGCDb.java:177)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:123)
+08-20 15:35:03 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(DriverManager.java:582)
+ at java.sql.DriverManager.getConnection(DriverManager.java:154)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadColorSchemes(GGCDb.java:801)
+ at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:733)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:130)
+08-20 15:35:05 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(DriverManager.java:582)
+ at java.sql.DriverManager.getConnection(DriverManager.java:154)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadConfigDataEntries(GGCDb.java:761)
+ at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:736)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:130)
+08-20 15:35:07 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(DriverManager.java:582)
+ at java.sql.DriverManager.getConnection(DriverManager.java:154)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.Loader.doQuery(Loader.java:661)
+ at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224)
+ at org.hibernate.loader.Loader.doList(Loader.java:2145)
+ at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029)
+ at org.hibernate.loader.Loader.list(Loader.java:2024)
+ at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308)
+ at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153)
+ at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106)
+ at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79)
+ at ggc.core.db.GGCDb.loadHbA1c(GGCDb.java:1194)
+ at ggc.core.db.GGCDb.getHbA1c(GGCDb.java:1157)
+ at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1129)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:138)
+08-20 15:35:09 database: opening /mnt/data_2/Projects_SVN/ggc/trunk/ggc/data/db/ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(DriverManager.java:582)
+ at java.sql.DriverManager.getConnection(DriverManager.java:154)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(Abstra...
[truncated message content] |
|
From: <and...@us...> - 2016-12-25 19:39:38
|
Revision: 1445
http://sourceforge.net/p/ggc/code/1445
Author: andyrozman
Date: 2016-12-25 19:39:36 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc-cgm
- moved to new subdirectory and to new structure
Modified Paths:
--------------
trunk/ggc-plugins/ggc-cgms/build/build.xml
Added Paths:
-----------
trunk/ggc-plugins/ggc-cgms/.amateras
trunk/ggc-plugins/ggc-cgms/.settings/
trunk/ggc-plugins/ggc-cgms/build/
trunk/ggc-plugins/ggc-cgms/doc/
trunk/ggc-plugins/ggc-cgms/pom.xml
Removed Paths:
-------------
trunk/ggc-cgm/.amateras
trunk/ggc-cgm/.settings/
trunk/ggc-cgm/build/
trunk/ggc-cgm/doc/
trunk/ggc-cgm/pom.xml
Deleted: trunk/ggc-cgm/.amateras
===================================================================
--- trunk/ggc-cgm/.amateras 2016-12-25 19:36:38 UTC (rev 1444)
+++ trunk/ggc-cgm/.amateras 2016-12-25 19:39:36 UTC (rev 1445)
@@ -1,12 +0,0 @@
-#EclipseHTMLEditor configuration file
-#Sat Apr 10 19:22:45 CEST 2010
-validateDTD=true
-javaScriptCompleters=
-useDTD=true
-validateJSP=true
-validateXML=true
-validateJS=true
-removeMarkers=false
-root=/
-validateHTML=true
-javaScripts=
Deleted: trunk/ggc-cgm/pom.xml
===================================================================
--- trunk/ggc-cgm/pom.xml 2016-12-25 19:36:38 UTC (rev 1444)
+++ trunk/ggc-cgm/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
@@ -1,82 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath>
- </parent>
-
- <name>GGC CGMS Tool Project</name>
-
- <artifactId>ggc-cgms-tool</artifactId>
- <version>${ggc-cgms-tool.version}</version>
-
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
- </dependency>
-
- <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId>
- </dependency> -->
-
- <dependency>
- <groupId>com.atech-software</groupId>
- <artifactId>atech-tools</artifactId>
- </dependency>
-
- <!-- NEW put into parent pom -->
-
-
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
- </dependency>
-
- <!--
- <dependency>
- <groupId>com.neuronrobotics</groupId>
- <artifactId>nrjavaserial</artifactId>
- </dependency>
- -->
- </dependencies>
-
- <properties>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- </properties>
-</project>
Copied: trunk/ggc-plugins/ggc-cgms/.amateras (from rev 1444, trunk/ggc-cgm/.amateras)
===================================================================
--- trunk/ggc-plugins/ggc-cgms/.amateras (rev 0)
+++ trunk/ggc-plugins/ggc-cgms/.amateras 2016-12-25 19:39:36 UTC (rev 1445)
@@ -0,0 +1,12 @@
+#EclipseHTMLEditor configuration file
+#Sat Apr 10 19:22:45 CEST 2010
+validateDTD=true
+javaScriptCompleters=
+useDTD=true
+validateJSP=true
+validateXML=true
+validateJS=true
+removeMarkers=false
+root=/
+validateHTML=true
+javaScripts=
Modified: trunk/ggc-plugins/ggc-cgms/build/build.xml
===================================================================
--- trunk/ggc-cgm/build/build.xml 2016-12-25 19:36:38 UTC (rev 1444)
+++ trunk/ggc-plugins/ggc-cgms/build/build.xml 2016-12-25 19:39:36 UTC (rev 1445)
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<project name="GNU PlugIn Base" default="build" basedir=".">
+<project name="GNU PlugIn Base" default="build" basedir="">
<description>
Build file for GGC
</description>
@@ -9,7 +9,7 @@
<property file="../../ggc-core-app/ggc-core/build/GGC_Core_Version.properties"/>
<property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseBuild.properties"/>
<property file="../../ggc-plugins/ggc-plugins-base/build/GGCPlugInBaseVersion.properties"/>
- <property file="./GGCCGMSToolVersion.properties"/>
+ <property file="GGCCGMSToolVersion.properties"/>
<!-- These should *not* be modified on the command line! -->
<property name="build.dir" value="${outdir.dir}/classes"/>
Copied: trunk/ggc-plugins/ggc-cgms/pom.xml (from rev 1444, trunk/ggc-cgm/pom.xml)
===================================================================
--- trunk/ggc-plugins/ggc-cgms/pom.xml (rev 0)
+++ trunk/ggc-plugins/ggc-cgms/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
@@ -0,0 +1,82 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath>
+ </parent>
+
+ <name>GGC CGMS Tool Project</name>
+
+ <artifactId>ggc-cgms-tool</artifactId>
+ <version>${ggc-cgms-tool.version}</version>
+
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src</sourceDirectory>
+ <scriptSourceDirectory>src</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-plugin-base</artifactId>
+ </dependency>
+
+ <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId>
+ </dependency> -->
+
+ <dependency>
+ <groupId>com.atech-software</groupId>
+ <artifactId>atech-tools</artifactId>
+ </dependency>
+
+ <!-- NEW put into parent pom -->
+
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <!--
+ <dependency>
+ <groupId>com.neuronrobotics</groupId>
+ <artifactId>nrjavaserial</artifactId>
+ </dependency>
+ -->
+ </dependencies>
+
+ <properties>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ </properties>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 20:11:23
|
Revision: 1446
http://sourceforge.net/p/ggc/code/1446
Author: andyrozman
Date: 2016-12-25 20:11:19 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc-cgm
- moved to new subdirectory and to new structure
Modified Paths:
--------------
trunk/ggc-desktop-app/ggc-desktop/pom.xml
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockSubTypeDialog.java
trunk/ggc-plugins/ggc-cgms/pom.xml
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataWriter.java
trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSTempValues.java
trunk/ggc-plugins/ggc-meter/pom.xml
trunk/ggc-plugins/ggc-nutrition/pom.xml
trunk/ggc-plugins/ggc-plugins-base/pom.xml
trunk/ggc-plugins/ggc-pump/pom.xml
trunk/ggc-plugins/pom.xml
trunk/pom.xml
Removed Paths:
-------------
trunk/ggc-cgm/
Modified: trunk/ggc-desktop-app/ggc-desktop/pom.xml
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-desktop-app/ggc-desktop/pom.xml 2016-12-25 20:11:19 UTC (rev 1446)
@@ -33,7 +33,7 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
+ <artifactId>ggc-plugins-base</artifactId>
</dependency>
@@ -54,7 +54,7 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-nutri-tool</artifactId>
+ <artifactId>ggc-nutrition-tool</artifactId>
</dependency>
<!--
Modified: trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockSubTypeDialog.java
===================================================================
--- trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockSubTypeDialog.java 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/stock/StockSubTypeDialog.java 2016-12-25 20:11:19 UTC (rev 1446)
@@ -80,7 +80,7 @@
subTypeObject = new StockSubTypeH();
}
- List<String> listFailed = new ArrayList();
+ List<String> listFailed = new ArrayList<String>();
StockTypeBase stb = StockTypeBase.getByDescription((String) comboStockType.getSelectedItem());
Modified: trunk/ggc-plugins/ggc-cgms/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-cgms/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-plugins/ggc-cgms/pom.xml 2016-12-25 20:11:19 UTC (rev 1446)
@@ -3,39 +3,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-removed/ggc-master-pom/pom.xml</relativePath>
+ <artifactId>ggc-plugins</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <name>GGC CGMS Tool Project</name>
+ <name>GGC Plugins - CGMS Tool</name>
<artifactId>ggc-cgms-tool</artifactId>
<version>${ggc-cgms-tool.version}</version>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
<dependencies>
<dependency>
@@ -45,11 +22,9 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
+ <artifactId>ggc-plugins-base</artifactId>
</dependency>
- <!-- <dependency> <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId> <artifactId>rxtxcomm</artifactId>
- </dependency> -->
<dependency>
<groupId>com.atech-software</groupId>
@@ -58,19 +33,13 @@
<!-- NEW put into parent pom -->
-
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>
- <!--
- <dependency>
- <groupId>com.neuronrobotics</groupId>
- <artifactId>nrjavaserial</artifactId>
- </dependency>
- -->
+
</dependencies>
<properties>
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataWriter.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataWriter.java 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSDataWriter.java 2016-12-25 20:11:19 UTC (rev 1446)
@@ -6,8 +6,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
+import com.atech.data.NotImplementedException;
import com.atech.utils.data.ATechDate;
import ggc.cgms.util.DataAccessCGMS;
@@ -166,7 +165,6 @@
{
if (owd instanceof CGMSValuesSubEntry)
{
-
CGMSValuesSubEntry cvse = (CGMSValuesSubEntry) owd;
// System.out.println("Value: " + cvse);
@@ -174,7 +172,8 @@
}
else
{
- throw new NotImplementedException();
+ throw new NotImplementedException(this.getClass(),
+ "writeObject() with value different than CGMSValuesSubEntry.");
}
}
Modified: trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSTempValues.java
===================================================================
--- trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSTempValues.java 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-plugins/ggc-cgms/src/main/java/ggc/cgms/data/CGMSTempValues.java 2016-12-25 20:11:19 UTC (rev 1446)
@@ -1,7 +1,6 @@
package ggc.cgms.data;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
+import com.atech.data.NotImplementedException;
import com.atech.utils.data.ATechDate;
import com.atech.utils.data.CodeEnum;
import com.atech.utils.data.CodeEnumWithTranslation;
@@ -52,7 +51,6 @@
this(_object_type, _base_type.getCode(), 0, null, isNumericValue);
}
-
// public CGMSTempValues(int _object_type, CodeEnumWithTranslation
// _base_type,
// Boolean isNumericValue)
@@ -67,6 +65,7 @@
// this(_object_type, _base_type, 0, null, isNumericValue);
// }
+
// public CGMSTempValues(int _object_type, CodeEnumWithTranslation
// _base_type, Boolean isNumericValue)
// {
@@ -128,7 +127,6 @@
super(objectType, baseType);
}
-
/**
* @param objectType
* @param baseType
@@ -138,6 +136,7 @@
// super(objectType.getCode(), baseType.getCode());
// }
+
/*
* public void writeObject(OutputWriter ow, String _value)
* {
@@ -165,7 +164,7 @@
if (this.object_type == CGMSObject.Base.getCode())
{
- new NotImplementedException();
+ new NotImplementedException(this.getClass(), "getData() with objectType CGMSObject.Base.");
// CGMSValuesEntry cve = new CGMSValuesEntry();
//
// cve.setType(this.base_type);
Modified: trunk/ggc-plugins/ggc-meter/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-meter/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-plugins/ggc-meter/pom.xml 2016-12-25 20:11:19 UTC (rev 1446)
@@ -30,7 +30,7 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
+ <artifactId>ggc-plugins-base</artifactId>
</dependency>
<!--
Modified: trunk/ggc-plugins/ggc-nutrition/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-nutrition/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-plugins/ggc-nutrition/pom.xml 2016-12-25 20:11:19 UTC (rev 1446)
@@ -9,8 +9,8 @@
</parent>
<name>GGC Plugins - Nutrition Tool</name>
- <artifactId>ggc-nutri-tool</artifactId>
- <version>${ggc-nutri-tool.version}</version>
+ <artifactId>ggc-nutrition-tool</artifactId>
+ <version>${ggc-nutrition-tool.version}</version>
@@ -22,7 +22,7 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
+ <artifactId>ggc-plugins-base</artifactId>
</dependency>
<dependency>
Modified: trunk/ggc-plugins/ggc-plugins-base/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-plugins-base/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-plugins/ggc-plugins-base/pom.xml 2016-12-25 20:11:19 UTC (rev 1446)
@@ -11,7 +11,7 @@
<name>GGC Plugins - Base</name>
<artifactId>ggc-plugins-base</artifactId>
- <version>${ggc-plugin-base.version}</version>
+ <version>${ggc-plugins-base.version}</version>
Modified: trunk/ggc-plugins/ggc-pump/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-pump/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-plugins/ggc-pump/pom.xml 2016-12-25 20:11:19 UTC (rev 1446)
@@ -12,30 +12,8 @@
<artifactId>ggc-pump-tool</artifactId>
<version>${ggc-pump-tool.version}</version>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src</sourceDirectory>
- <scriptSourceDirectory>src</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
+
<dependencies>
<dependency>
<groupId>net.sf.ggc</groupId>
@@ -44,7 +22,7 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
+ <artifactId>ggc-plugins-base</artifactId>
</dependency>
<dependency>
Modified: trunk/ggc-plugins/pom.xml
===================================================================
--- trunk/ggc-plugins/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/ggc-plugins/pom.xml 2016-12-25 20:11:19 UTC (rev 1446)
@@ -19,6 +19,7 @@
<module>ggc-meter</module>
<module>ggc-pump</module>
<module>ggc-nutrition</module>
+ <module>ggc-cgms</module>
</modules>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2016-12-25 19:39:36 UTC (rev 1445)
+++ trunk/pom.xml 2016-12-25 20:11:19 UTC (rev 1446)
@@ -228,8 +228,8 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
- <version>${ggc-plugin-base.version}</version>
+ <artifactId>ggc-plugins-base</artifactId>
+ <version>${ggc-plugins-base.version}</version>
</dependency>
<dependency>
@@ -252,8 +252,8 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-nutri-tool</artifactId>
- <version>${ggc-nutri-tool.version}</version>
+ <artifactId>ggc-nutrition-tool</artifactId>
+ <version>${ggc-nutrition-tool.version}</version>
</dependency>
<dependency>
@@ -512,11 +512,11 @@
<!-- GGC Modules versions -->
<ggc-core.version>0.8.0-SNAPSHOT</ggc-core.version>
- <ggc-plugin-base.version>1.2.2-SNAPSHOT</ggc-plugin-base.version>
+ <ggc-plugins-base.version>1.2.2-SNAPSHOT</ggc-plugins-base.version>
<ggc-meter-tool.version>2.4.1-SNAPSHOT</ggc-meter-tool.version>
<ggc-pump-tool.version>2.0.1-SNAPSHOT</ggc-pump-tool.version>
<ggc-cgms-tool.version>1.5.1-SNAPSHOT</ggc-cgms-tool.version>
- <ggc-nutri-tool.version>1.4.1-SNAPSHOT</ggc-nutri-tool.version>
+ <ggc-nutrition-tool.version>1.4.1-SNAPSHOT</ggc-nutrition-tool.version>
<ggc-connect-tool.version>0.1.0-SNAPSHOT</ggc-connect-tool.version>
<ggc-desktop.version>0.8.0-SNAPSHOT</ggc-desktop.version>
<ggc-help.version>0.2.2-SNAPSHOT</ggc-help.version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 20:29:27
|
Revision: 1449
http://sourceforge.net/p/ggc/code/1449
Author: andyrozman
Date: 2016-12-25 20:29:24 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc
- moving files arround
Added Paths:
-----------
trunk/ggc-doctor-app/ggc-desktop-doctor/data/
trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/java/ggc/
trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/StartupConfig.properties
trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/icons/
trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/log4j.properties
Removed Paths:
-------------
trunk/ggc-doctor/data/
trunk/ggc-doctor/src/StartupConfig.properties
trunk/ggc-doctor/src/ggc/
trunk/ggc-doctor/src/icons/
trunk/ggc-doctor/src/log4j.properties
Deleted: trunk/ggc-doctor/src/StartupConfig.properties
===================================================================
--- trunk/ggc-doctor/src/StartupConfig.properties 2016-12-25 20:24:34 UTC (rev 1448)
+++ trunk/ggc-doctor/src/StartupConfig.properties 2016-12-25 20:29:24 UTC (rev 1449)
@@ -1,17 +0,0 @@
-
-#
-# Java executable (on most systems you don't need to change this parameter). Some system require full path to
-# executable
-#
-JAVA_EXE=java
-
-
-
-
-
-#
-# Do not edit past this line
-#
-
-
-UPDATE_CONFIG=../data/update/GGC_Update.properties
Deleted: trunk/ggc-doctor/src/log4j.properties
===================================================================
--- trunk/ggc-doctor/src/log4j.properties 2016-12-25 20:24:34 UTC (rev 1448)
+++ trunk/ggc-doctor/src/log4j.properties 2016-12-25 20:29:24 UTC (rev 1449)
@@ -1,59 +0,0 @@
-### direct log messages to stdout ###
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-#log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%d %5p [%c{1}:%L] - %m%n
-log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n
-#log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n
-
-#log4j.appender.stderr=org.apache.log4j.ConsoleAppender
-#log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
-##log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n
-#log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n
-
-
-### direct messages to file hibernate.log ###
-log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.file.File=../data/log/GGC.log
-log4j.appender.file.DatePattern='.'yyyy-MM-dd
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d %5p [%c{1}:%L] - %m%n
-log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n
-
-
-
-
-### set log levels - for more verbose logging change 'info' to 'debug' ###
-
-log4j.rootLogger=debug, stdout, file
-
-### log just the SQL
-
-log4j.logger.org.hibernate=info
-log4j.logger.org.hibernate.SQL=info
-
-log4j.logger.ggc.core.db.GGCDb=info
-
-
-### log JDBC bind parameters ###
-log4j.logger.org.hibernate.type=info
-
-### log schema export/update ###
-log4j.logger.net.sf.hibernate.tool.hbm2ddl=info
-log4j.logger.net.sf.hibernate.tool.hbm2java=info
-
-### log cache activity ###
-#log4j.logger.net.sf.hibernate.cache=debug
-
-### enable the following line if you want to track down connection ###
-### leakages when using DriverManagerConnectionProvider ###
-#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace
-
-
-### Redirect needs another formatting
-#log4j.logger.com.atech.utils.logs=debug
-#log4j.logger.com.atech.utils.logs.layout=org.apache.log4j.PatternLayout
-#log4j.logger.com.atech.utils.logs.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n
-
-
Copied: trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/StartupConfig.properties (from rev 1446, trunk/ggc-doctor/src/StartupConfig.properties)
===================================================================
--- trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/StartupConfig.properties (rev 0)
+++ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/StartupConfig.properties 2016-12-25 20:29:24 UTC (rev 1449)
@@ -0,0 +1,17 @@
+
+#
+# Java executable (on most systems you don't need to change this parameter). Some system require full path to
+# executable
+#
+JAVA_EXE=java
+
+
+
+
+
+#
+# Do not edit past this line
+#
+
+
+UPDATE_CONFIG=../data/update/GGC_Update.properties
Copied: trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/log4j.properties (from rev 1446, trunk/ggc-doctor/src/log4j.properties)
===================================================================
--- trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/log4j.properties (rev 0)
+++ trunk/ggc-doctor-app/ggc-desktop-doctor/src/main/resources/log4j.properties 2016-12-25 20:29:24 UTC (rev 1449)
@@ -0,0 +1,59 @@
+### direct log messages to stdout ###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+#log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+#log4j.appender.stdout.layout.ConversionPattern=%d %5p [%c{1}:%L] - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n
+#log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n
+
+#log4j.appender.stderr=org.apache.log4j.ConsoleAppender
+#log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
+##log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n
+#log4j.appender.stderr.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n
+
+
+### direct messages to file hibernate.log ###
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.File=../data/log/GGC.log
+log4j.appender.file.DatePattern='.'yyyy-MM-dd
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%d %5p [%c{1}:%L] - %m%n
+log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p [%c{1}:%L] - %m%n
+
+
+
+
+### set log levels - for more verbose logging change 'info' to 'debug' ###
+
+log4j.rootLogger=debug, stdout, file
+
+### log just the SQL
+
+log4j.logger.org.hibernate=info
+log4j.logger.org.hibernate.SQL=info
+
+log4j.logger.ggc.core.db.GGCDb=info
+
+
+### log JDBC bind parameters ###
+log4j.logger.org.hibernate.type=info
+
+### log schema export/update ###
+log4j.logger.net.sf.hibernate.tool.hbm2ddl=info
+log4j.logger.net.sf.hibernate.tool.hbm2java=info
+
+### log cache activity ###
+#log4j.logger.net.sf.hibernate.cache=debug
+
+### enable the following line if you want to track down connection ###
+### leakages when using DriverManagerConnectionProvider ###
+#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace
+
+
+### Redirect needs another formatting
+#log4j.logger.com.atech.utils.logs=debug
+#log4j.logger.com.atech.utils.logs.layout=org.apache.log4j.PatternLayout
+#log4j.logger.com.atech.utils.logs.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p - %m%n
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 20:36:24
|
Revision: 1452
http://sourceforge.net/p/ggc/code/1452
Author: andyrozman
Date: 2016-12-25 20:36:22 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc
- moving files arround
Modified Paths:
--------------
trunk/pom.xml
Added Paths:
-----------
trunk/ggc-android-app/
trunk/ggc-removed/ggc-doctor_server/
Removed Paths:
-------------
trunk/build/
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2016-12-25 20:32:00 UTC (rev 1451)
+++ trunk/pom.xml 2016-12-25 20:36:22 UTC (rev 1452)
@@ -594,9 +594,9 @@
<module>atech-tools</module>
<module>ggc-core-app</module>
<module>ggc-plugins</module>
+ <module>ggc-support</module>
<module>ggc-desktop-app</module>
<module>ggc-doctor-app</module>
- <module>ggc-support</module>
</modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-25 20:52:11
|
Revision: 1453
http://sourceforge.net/p/ggc/code/1453
Author: andyrozman
Date: 2016-12-25 20:52:08 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc
- moving files arround
Modified Paths:
--------------
trunk/ggc-plugins/ggc-connect/pom.xml
trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2016-12-25 20:36:22 UTC (rev 1452)
+++ trunk 2016-12-25 20:52:08 UTC (rev 1453)
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
## -5,3 +5,5 ##
ggc-device-minimed-decode
ggc-device-minimed
+
+\*.iml
Modified: trunk/ggc-plugins/ggc-connect/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-connect/pom.xml 2016-12-25 20:36:22 UTC (rev 1452)
+++ trunk/ggc-plugins/ggc-connect/pom.xml 2016-12-25 20:52:08 UTC (rev 1453)
@@ -3,53 +3,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <relativePath>../ggc-master-pom/pom.xml</relativePath>
+ <artifactId>ggc-plugins</artifactId>
+ <version>0.8-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.sf.ggc</groupId>
- <name>GGC Connect Tool Project</name>
-
+ <name>GGC Plugins - Connect Tool</name>
<description>Plugin to connect to other software (import/export) of our data into foreign systems.</description>
-
<artifactId>ggc-connect-tool</artifactId>
<version>${ggc-connect-tool.version}</version>
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src/main/java</sourceDirectory>
- <!-- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory> -->
-
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
-
<dependencies>
<dependency>
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-core</artifactId>
</dependency>
-
<dependency>
<groupId>com.atech-software</groupId>
<artifactId>atech-tools</artifactId>
@@ -57,10 +28,9 @@
<dependency>
<groupId>net.sf.ggc</groupId>
- <artifactId>ggc-plugin-base</artifactId>
+ <artifactId>ggc-plugins-base</artifactId>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -75,7 +45,6 @@
<version>8.4-702.jdbc3</version>
</dependency>
-
</dependencies>
<properties>
Modified: trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java
===================================================================
--- trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java 2016-12-25 20:36:22 UTC (rev 1452)
+++ trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java 2016-12-25 20:52:08 UTC (rev 1453)
@@ -637,7 +637,7 @@
tx.commit();
- return "" + _id.longValue();
+ return "" + _id;
}
@@ -724,7 +724,7 @@
{
if (this.group_type == 1)
{
- this.group_db1 = (FoodGroupH) sess.get(FoodGroupH.class, new Long(this.getId()));
+ this.group_db1 = (FoodGroupH) sess.get(FoodGroupH.class, this.getId());
sess.update(this.group_db1);
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2016-12-26 14:02:40
|
Revision: 1456
http://sourceforge.net/p/ggc/code/1456
Author: andyrozman
Date: 2016-12-26 14:02:38 +0000 (Mon, 26 Dec 2016)
Log Message:
-----------
- minor changes
Modified Paths:
--------------
trunk/ggc-future/pom.xml
trunk/ggc-plugins/ggc-plugins-base/docs/Changelog
trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/data/enums/DeviceCompanyDefinition.java
trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/data/enums/DeviceHandlerType.java
trunk/pom.xml
Modified: trunk/ggc-future/pom.xml
===================================================================
--- trunk/ggc-future/pom.xml 2016-12-26 14:02:03 UTC (rev 1455)
+++ trunk/ggc-future/pom.xml 2016-12-26 14:02:38 UTC (rev 1456)
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>GGC Future Modules</name>
+ <name>GGC Future</name>
<artifactId>ggc-future</artifactId>
<packaging>pom</packaging>
Modified: trunk/ggc-plugins/ggc-plugins-base/docs/Changelog
===================================================================
--- trunk/ggc-plugins/ggc-plugins-base/docs/Changelog 2016-12-26 14:02:03 UTC (rev 1455)
+++ trunk/ggc-plugins/ggc-plugins-base/docs/Changelog 2016-12-26 14:02:38 UTC (rev 1456)
@@ -2,6 +2,9 @@
Changes file for GGC Plug-In Base
==================================
+1.2.3 [25.12.2016]
+- refactoring AccuChek meters to MeterInterface V2
+
1.2.2 [26.6.2016] [Andy]
- extended CommunicationInterface
- refactorings
Modified: trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/data/enums/DeviceCompanyDefinition.java
===================================================================
--- trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/data/enums/DeviceCompanyDefinition.java 2016-12-26 14:02:03 UTC (rev 1455)
+++ trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/data/enums/DeviceCompanyDefinition.java 2016-12-26 14:02:38 UTC (rev 1456)
@@ -2,7 +2,6 @@
import ggc.plugin.manager.DeviceImplementationStatus;
-
/**
* Application: GGC - GNU Gluco Control
* Plug-in: Meter Tool (support for Meter devices)
@@ -29,15 +28,16 @@
* Author: Andy {an...@at...}
*/
-public enum DeviceCompanyDefinition {
+public enum DeviceCompanyDefinition
+{
// 1xx = Meter
Ascensia(101, "Ascensia/Bayer", "", DeviceImplementationStatus.Done), //
+ // AccuChek(102, "Accu-Chek/Roche", "", DeviceImplementationStatus.Done), //
Lifescan(103, "One Touch/Lifescan", "", DeviceImplementationStatus.Partitial), //
Menarini(105, "Menarini", "", DeviceImplementationStatus.Planned), //
Arkray(106, "Arkray", "", DeviceImplementationStatus.Planned), //
-
// 2xx = Pump
Deltec(205, "Deltec", "", DeviceImplementationStatus.NotAvailable), //
Insulet(206, "Insulet", "", DeviceImplementationStatus.Done), //
@@ -47,14 +47,13 @@
// 3xx = CGMS
Dexcom(301, "Dexcom", "", DeviceImplementationStatus.Partitial), //
-
// 4xx = Pump + CGMS
Animas(401, "Animas", "", DeviceImplementationStatus.Full), //
Minimed(402, "Minimed", "", DeviceImplementationStatus.Planned), //
Tandem(403, "Tandem", "", DeviceImplementationStatus.Planned), //
// 5xx = Meter + Pump
- Roche(202, "AccuChek/Roche", "", DeviceImplementationStatus.Partitial), // Disetronic(2),
+ Roche(202, "AccuChek/Roche", "", DeviceImplementationStatus.Done), // Disetronic(2),
// 6xx = Meter + CGMS
Abbott(302, "Abbott", "", DeviceImplementationStatus.NotAvailable), //
@@ -69,7 +68,8 @@
DeviceImplementationStatus companyImplementationStatus;
- DeviceCompanyDefinition(int id, String name, String description, DeviceImplementationStatus implementationStatus) {
+ DeviceCompanyDefinition(int id, String name, String description, DeviceImplementationStatus implementationStatus)
+ {
this.id = id;
this.companyName = name;
this.companyDescription = description;
@@ -77,22 +77,26 @@
}
- public String getName() {
+ public String getName()
+ {
return this.companyName;
}
- public int getCompanyId() {
+ public int getCompanyId()
+ {
return this.id;
}
- public String getDescription() {
+ public String getDescription()
+ {
return this.companyDescription;
}
- public DeviceImplementationStatus getImplementationStatus() {
+ public DeviceImplementationStatus getImplementationStatus()
+ {
return this.companyImplementationStatus;
}
Modified: trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/data/enums/DeviceHandlerType.java
===================================================================
--- trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/data/enums/DeviceHandlerType.java 2016-12-26 14:02:03 UTC (rev 1455)
+++ trunk/ggc-plugins/ggc-plugins-base/src/main/java/ggc/plugin/data/enums/DeviceHandlerType.java 2016-12-26 14:02:38 UTC (rev 1456)
@@ -37,6 +37,7 @@
AscensiaUsbHandler(DownloadSupportType.DownloadData), //
ArkrayMeterHandler(DownloadSupportType.DownloadData), //
MenariniMeterHandler(DownloadSupportType.DownloadData), //
+ AccuChekMeterHandler(DownloadSupportType.DownloadData), //
// Pumps
AnimasV2PumpHandler(DownloadSupportType.Download_Data_Config), //
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2016-12-26 14:02:03 UTC (rev 1455)
+++ trunk/pom.xml 2016-12-26 14:02:38 UTC (rev 1456)
@@ -595,6 +595,7 @@
<module>ggc-core-app</module>
<module>ggc-plugins</module>
<module>ggc-support</module>
+ <module>ggc-future</module>
<module>ggc-desktop-app</module>
<module>ggc-doctor-app</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2017-06-19 18:10:41
|
Revision: 1457
http://sourceforge.net/p/ggc/code/1457
Author: andyrozman
Date: 2017-06-19 18:10:37 +0000 (Mon, 19 Jun 2017)
Log Message:
-----------
0.8.0
- added few enums
- fixed configuration
- fixed Hibernate classes (and hbm configuration)
- added classes for DbTool integration
- refactoring database
- moved classes to different package (from shared)
Modified Paths:
--------------
trunk/ggc-core-app/ggc-core/docs/Changelog
trunk/ggc-core-app/ggc-core/pom.xml
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/CollectionValues.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DailyValues.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DailyValuesRow.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/ExtendedRatioCollection.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/GlucoValues.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigCellRenderer.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigurationManager.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigurationManagerWrapper.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/GlucoseUnitType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/StockTypeBase.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/graph/v1/GGCGraphUtil.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/graph/v1/gui/HbA1cDialog.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/graph/v1/view/GraphViewCourse.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/graph/v1/view/GraphViewDaily.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/GGCDb.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/GGCDbConfig.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/GGCDbLoader.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/datalayer/DailyValue.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/datalayer/Settings.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/datalayer/SettingsColorScheme.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/datalayer/StockBaseType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/datalayer/StockSubType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/DbInfoH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/StockH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/StockSubTypeH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/cgms/CGMSDataExtendedH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/cgms/CGMSDataH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/doc/DoctorAppointmentH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/doc/DoctorH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/doc/DoctorTypeH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodDescriptionH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodGroupH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodUserDescriptionH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/food/FoodUserGroupH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/food/MealGroupH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/food/MealH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/food/NutritionDefinitionH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/food/NutritionHomeWeightTypeH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/inet/InetGroupH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/inet/InetLinkGroupH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/inet/InetLinkH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/inet/InetTypeH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/pump/PumpDataExtendedH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/pump/PumpDataH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/pump/PumpProfileH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/DbToolApplicationGGC.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/InitDb.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/data/GGCDatabaseTableConfiguration.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/data/GGCDatabaseVersionConfiguration.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/defs/GGCImportExportContext.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/impexp/GGCDbExportConverter.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/impexp/GGCDbImportConverter.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/impexp/GGCDbImporter.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/init/GGCCustomDbInitTasks.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/init/GGCDbToolInitDbRunner.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/init/InitDb2.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportDailyValues.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportNutritionDb.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/ExportSettings.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCExporter.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/GGCImporter.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportDailyValues.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportNutrition.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/ImportSettings.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/transfer/RestoreGGCDialog.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/plugins/CGMSPlugIn.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/plugins/ConnectPlugIn.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/plugins/GGCDataWriter.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/plugins/GGCPluginClient.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/plugins/GGCPluginType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/plugins/MetersPlugIn.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/plugins/NutriPlugIn.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/plugins/PumpsPlugIn.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/test/ImportDacioDb.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/util/DataAccess.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/util/GGCProperties.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/util/GGCSoftwareMode.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/util/upgrade/GGCUpgradeApplicationContext.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/util/upgrade/UpgradeChecker.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/bolushelper/BolusHelper.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/fooddesc/FoodDescriptionDialog.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/ratio/RatioBaseDialog.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/ratio/RatioCalculatorDialog.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/ratio/RatioEntry.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/ratio/RatioEntryDialog.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/ratio/RatioEntryDisplay.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/ratio/RatioEntryPanel.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/ratio/RatioExtendedDialog.java
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_CGMS.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Main.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_New.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Nutrition.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Other.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_Pump.hbm.xml
trunk/ggc-core-app/ggc-core/src/main/resources/GGC_en.properties
Added Paths:
-----------
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DataValuesInterface.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/DatabaseStatusType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/GGCObservableType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryGroupType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryItemUnit.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryItemUsageUnit.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/RefreshInfoType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/ReturnActionType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/GGCDataTransformer.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/dto/StockSubTypeDto.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/GGCDataDefinitionTable.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/GGCHibernateBackupSelectableObject.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/GGCHibernateSelectableObject.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/inventory/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/inventory/InventoryH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/inventory/InventoryItemH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/inventory/InventoryItemTypeH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/pen/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/pen/DayValueH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/settings/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/settings/ColorSchemeH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/settings/SettingsH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/enums/GGCFunctionality.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/enums/GGCInternalSettings.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/enums/PropertiesDialogType.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/gui/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/gui/GGCGuiHelper.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/gui/UserManagement.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/gui/dialogs/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/gui/dialogs/selector/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/util/inventory/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/util/inventory/InventoryUtil.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/Important.txt
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/bolushelper/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/fooddesc/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/ratio/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/selector/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/selector/GGCSelectorConfiguration.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/selector/GGCSelectorDialog.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/gui/dialogs/selector/GGCSelectorType.java
trunk/ggc-core-app/ggc-core/src/main/templates/
trunk/ggc-core-app/ggc-core/src/main/templates/Version.java.template
trunk/ggc-core-app/ggc-core/src/test/
trunk/ggc-core-app/ggc-core/src/test/java/
trunk/ggc-core-app/ggc-core/src/test/java/ggc/
trunk/ggc-core-app/ggc-core/src/test/java/ggc/misc/
trunk/ggc-core-app/ggc-core/src/test/java/ggc/misc/Test.java
trunk/ggc-core-app/ggc-doctor-core/src/main/java/ggc/
trunk/ggc-core-app/ggc-doctor-core/src/main/java/ggc/core/
trunk/ggc-core-app/ggc-doctor-core/src/main/java/ggc/core/doc/
trunk/ggc-core-app/ggc-doctor-core/src/main/java/ggc/core/doc/util/
trunk/ggc-core-app/ggc-doctor-core/src/main/java/ggc/core/doc/util/DataAccessDoc.java
Removed Paths:
-------------
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/StockUsageUnit.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/doc/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/ColorSchemeH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/DayValueH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/SettingsH.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/hibernate/stocks/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/impexp/DbImportExportDto.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/db/tool/impexp/GGCDbExporter.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/doc/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/shared/Test.java
trunk/ggc-core-app/ggc-core/src/main/java/ggc/shared/bolushelper/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/shared/fooddesc/
trunk/ggc-core-app/ggc-core/src/main/java/ggc/shared/ratio/
trunk/ggc-desktop-app/ggc-desktop/src/main/java/ggc/gui/dialogs/doctor/DoctorTypeSelector.java
Property Changed:
----------------
trunk/ggc-core-app/
Index: trunk/ggc-core-app
===================================================================
--- trunk/ggc-core-app 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app 2017-06-19 18:10:37 UTC (rev 1457)
Property changes on: trunk/ggc-core-app
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*.iml
Modified: trunk/ggc-core-app/ggc-core/docs/Changelog
===================================================================
--- trunk/ggc-core-app/ggc-core/docs/Changelog 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/docs/Changelog 2017-06-19 18:10:37 UTC (rev 1457)
@@ -6,6 +6,15 @@
--------------------------------------------------------------------------------------------------
+0.8 [19.6.2017] [Andy]
+- added few enums
+- fixed configuration
+- fixed Hibernate classes (and hbm configuration)
+- added classes for DbTool integration
+- refactoring database
+- moved classes to different package (from shared)
+
+
0.7 [18.5.2016] [Andy]
- started implementation of graph v2
- fixing graph v1 and extending it to be used by pump also
Modified: trunk/ggc-core-app/ggc-core/pom.xml
===================================================================
--- trunk/ggc-core-app/ggc-core/pom.xml 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/pom.xml 2017-06-19 18:10:37 UTC (rev 1457)
@@ -14,6 +14,36 @@
<artifactId>ggc-core</artifactId>
<version>${ggc-core.version}</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ </plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/ggc/core/util/</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin> -->
+ </plugins>
+ </build>
+
+
<dependencies>
<dependency>
<groupId>com.atech-software</groupId>
@@ -102,6 +132,12 @@
<version>8.4-702.jdbc3</version>
</dependency>
+ </dependencies>
- </dependencies>
+ <properties>
+ <version.file>
+ ${project.build.directory}/generated-sources/ggc/core/util/Version.java
+ </version.file>
+ </properties>
+
</project>
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/CollectionValues.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/CollectionValues.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/CollectionValues.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -1,12 +1,13 @@
package ggc.core.data;
-import ggc.core.util.DataAccess;
-
import java.util.ArrayList;
import java.util.GregorianCalendar;
+import java.util.List;
import com.atech.utils.data.ATechDate;
+import ggc.core.util.DataAccess;
+
/**
* Application: GGC - GNU Gluco Control
*
@@ -39,12 +40,12 @@
{
// private boolean debug = false;
- // private I18nControlAbstract m_ic =
+ // private I18nControlAbstract i18nControl =
// DataAccess.getInstance().getI18nControlInstance();
private static final long serialVersionUID = 4415864395080066275L;
- ArrayList<DailyValuesRow> dataRows = new ArrayList<DailyValuesRow>();
+ List<DailyValuesRow> dataRows = new ArrayList<DailyValuesRow>();
long date = 0;
@@ -71,6 +72,7 @@
DataAccess m_da = DataAccess.getInstance();
+
// Hashtable<String,ArrayList>
/**
@@ -85,6 +87,7 @@
setDayRange(sDay, eDay);
}
+
/**
* Set Day Range
*
@@ -95,7 +98,7 @@
{
// long diff = eDay.getTimeInMillis() - sDay.getTimeInMillis();
- ArrayList<DailyValuesRow> lst = DataAccess.getInstance().getDb().getDayValuesRange(sDay, eDay);
+ List<DailyValuesRow> lst = DataAccess.getInstance().getDb().getDayValuesRange(sDay, eDay);
for (int i = 0; i < lst.size(); i++)
{
@@ -104,6 +107,7 @@
}
+
/**
* Reset Changed
*/
@@ -113,6 +117,7 @@
changed = false;
}
+
/**
* Set Date
*
@@ -124,6 +129,7 @@
this.date = date;
}
+
/**
* Set Std Dev
* @param stdDev
@@ -134,6 +140,7 @@
this.stdDev = stdDev;
}
+
/**
* Add Row
*
@@ -149,6 +156,7 @@
refreshStatData();
}
+
/**
* Delete Row
* @param i
@@ -181,6 +189,7 @@
}
+
/**
* Get Row Count
*
@@ -195,6 +204,7 @@
return dataRows.size();
}
+
/**
* Get Row
*
@@ -207,6 +217,7 @@
return this.dataRows.get(index);
}
+
/**
* Get Value At
*
@@ -220,6 +231,7 @@
return getRow(row).getValueAt(column);
}
+
/**
* Get Day And Month As String
*
@@ -234,6 +246,7 @@
return String.format("%1$02d.%2$02d.", day, month);
}
+
/**
* Get Date
*
@@ -245,6 +258,7 @@
return date;
}
+
/**
* Get Date As Localized String
*
@@ -262,6 +276,7 @@
new ATechDate(ATechDate.FORMAT_DATE_AND_TIME_MIN, this.date).getGregorianCalendar(), 4);
}
+
/**
* Get Date As String
*
@@ -273,6 +288,7 @@
return getDateAsLocalizedString();
}
+
/**
* Get Changed
*
@@ -285,6 +301,7 @@
return getRow(row).hasChanged();
}
+
/**
* Get Sum CH Per Day
*
@@ -298,6 +315,7 @@
return this.getSumCH() / this.day_count.size();
}
+
/**
* Get CH Count Per Day
*
@@ -311,6 +329,7 @@
return this.getCHCount() / this.day_count.size();
}
+
/**
* Get Sum Bolus Per Day
*
@@ -324,6 +343,7 @@
return this.getSumBolus() / this.day_count.size();
}
+
/**
* Get Bolus Count Per Day
*
@@ -337,6 +357,7 @@
return this.getBolusCount() / this.day_count.size();
}
+
/**
* Get Sum Basal Per Day
*
@@ -350,6 +371,7 @@
return this.getSumBasal() / this.day_count.size();
}
+
/**
* Get Basal Count Per Day
*
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DailyValues.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DailyValues.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DailyValues.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -9,7 +9,7 @@
import com.atech.utils.data.ATechDate;
import ggc.core.data.defs.GlucoseUnitType;
-import ggc.core.db.hibernate.DayValueH;
+import ggc.core.db.hibernate.pen.DayValueH;
import ggc.core.util.DataAccess;
/**
@@ -40,7 +40,7 @@
* @author Andy {an...@at...}
*/
-public class DailyValues implements Serializable
+public class DailyValues implements Serializable, DataValuesInterface
{
private static final long serialVersionUID = -375771912636631298L;
@@ -434,6 +434,18 @@
}
+ public Class<?> getColumnClass(int row)
+ {
+ return String.class;
+ }
+
+
+ public boolean isCellEditable(int row, int col)
+ {
+ return false;
+ }
+
+
/**
* Get Average BG Raw (mg/dL)
*
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DailyValuesRow.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DailyValuesRow.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DailyValuesRow.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -17,7 +17,7 @@
import ggc.core.data.cfg.ConfigurationManagerWrapper;
import ggc.core.data.defs.GlucoseUnitType;
-import ggc.core.db.hibernate.DayValueH;
+import ggc.core.db.hibernate.pen.DayValueH;
import ggc.core.util.DataAccess;
/**
@@ -76,10 +76,10 @@
private boolean changed = false;
DayValueH m_dv = null;
- DataAccess m_da = DataAccess.getInstance();
+ DataAccess dataAccess = DataAccess.getInstance();
// GGCProperties props = dataAccess.getSettings();
- ConfigurationManagerWrapper configurationManagerWrapper = m_da.getConfigurationManagerWrapper();
+ ConfigurationManagerWrapper configurationManagerWrapper = dataAccess.getConfigurationManagerWrapper();
boolean debug = false;
ExtendedEnumHandler extendedHandler = null;
@@ -130,12 +130,12 @@
public DailyValuesRow(DayValueH dv)
{
- this.datetime = new ATechDate(ATechDateType.DateAndTimeMin, dv.getDt_info());
+ this.datetime = new ATechDate(ATechDateType.DateAndTimeMin, dv.getDtInfo());
this.bg = dv.getBg();
this.ins1 = dv.getIns1();
this.ins2 = dv.getIns2();
this.ch = dv.getCh();
- this.meals = dv.getMeals_ids();
+ this.meals = dv.getMealsIds();
this.extended = dv.getExtended();
this.comment = dv.getComment();
@@ -160,7 +160,7 @@
// this.setExtendedValue(ExtendedDailyValueType.Activity, act, false);
// this.setExtendedValue(ExtendedDailyValueType.Urine, urine, false);
//
- // // this.meals = dv.getMeals_ids();
+ // // this.meals = dv.getMealsIds();
// // this.extended = dv.getExtended();
// this.comment = Comment;
//
@@ -168,13 +168,13 @@
private void setExtendedHandler()
{
- this.extendedHandler = (ExtendedEnumHandler) m_da.getExtendedHandler("DailyValuesRow");
+ this.extendedHandler = (ExtendedEnumHandler) dataAccess.getExtendedHandler("DailyValuesRow");
}
public boolean areMealsSet()
{
- if (m_da.isValueSet(this.meals) || this.isExtendedValueSet(ExtendedDailyValueType.FoodDescription))
+ if (dataAccess.isValueSet(this.meals) || this.isExtendedValueSet(ExtendedDailyValueType.FoodDescription))
return true;
else
return false;
@@ -188,7 +188,7 @@
*/
public int areMealsSetType()
{
- if (m_da.isValueSet(this.meals))
+ if (dataAccess.isValueSet(this.meals))
return 1;
else if (this.isExtendedValueSet(ExtendedDailyValueType.FoodDescription))
return 2;
@@ -228,8 +228,8 @@
dt[3] = strtok.nextToken(); // hour
dt[4] = strtok.nextToken(); // minute
- String dt_out = dt[0] + m_da.getLeadingZero(dt[1], 2) + m_da.getLeadingZero(dt[2], 2)
- + m_da.getLeadingZero(dt[3], 2) + m_da.getLeadingZero(dt[4], 2);
+ String dt_out = dt[0] + dataAccess.getLeadingZero(dt[1], 2) + dataAccess.getLeadingZero(dt[2], 2)
+ + dataAccess.getLeadingZero(dt[3], 2) + dataAccess.getLeadingZero(dt[4], 2);
return new ATechDate(ATechDateType.DateAndTimeMin, Long.parseLong(dt_out));
}
@@ -366,7 +366,7 @@
if (configurationManagerWrapper.getGlucoseUnit() == GlucoseUnitType.mmol_L)
{
- float v = m_da.getBGValueByTypeFromDefault(GlucoseUnitType.mmol_L, bg);
+ float v = dataAccess.getBGValueByTypeFromDefault(GlucoseUnitType.mmol_L, bg);
if (debug)
{
@@ -405,7 +405,7 @@
if (configurationManagerWrapper.getGlucoseUnit() == GlucoseUnitType.mmol_L)
{
- float v = m_da.getBGValueByTypeFromDefault(GlucoseUnitType.mmol_L, bg);
+ float v = dataAccess.getBGValueByTypeFromDefault(GlucoseUnitType.mmol_L, bg);
if (debug)
{
@@ -412,7 +412,7 @@
System.out.println("getBgAsString [type=2,return=" + v + "]");
}
- return DataAccess.getFloatAsString(v, 1);
+ return dataAccess.getFloatAsString(v, 1);
}
else
{
@@ -437,7 +437,7 @@
if (glucoseUnitType == GlucoseUnitType.mmol_L)
{
- float v = m_da.getBGValueByTypeFromDefault(GlucoseUnitType.mmol_L, bg);
+ float v = dataAccess.getBGValueByTypeFromDefault(GlucoseUnitType.mmol_L, bg);
if (debug)
{
@@ -444,7 +444,7 @@
System.out.println("getBgAsString [type=2,return=" + v + "]");
}
- return DataAccess.getFloatAsString(v, 1);
+ return dataAccess.getFloatAsString(v, 1);
}
else
{
@@ -484,7 +484,7 @@
System.out.println("Internal value: " + this.bg);
}
- return m_da.getBGValueByTypeFromDefault(GlucoseUnitType.getByCode(type), bg);
+ return dataAccess.getBGValueByTypeFromDefault(GlucoseUnitType.getByCode(type), bg);
}
@@ -501,7 +501,7 @@
System.out.println("Internal value: " + this.bg);
}
- return m_da.getBGValueByTypeFromDefault(type, bg);
+ return dataAccess.getBGValueByTypeFromDefault(type, bg);
}
@@ -525,10 +525,10 @@
if (debug)
{
System.out.println("SET BG :: MMOL");
- System.out.println(" " + (int) m_da.getBGValueDifferent(type, val));
+ System.out.println(" " + (int) dataAccess.getBGValueDifferent(type, val));
}
- this.setBG((int) m_da.getBGValueDifferent(type, val));
+ this.setBG((int) dataAccess.getBGValueDifferent(type, val));
}
else
{
@@ -644,7 +644,7 @@
if (dec == 0)
return "" + val;
else
- return DataAccess.getFloatAsString(val + 0.1f * dec, 1);
+ return dataAccess.getFloatAsString(val + 0.1f * dec, 1);
}
@@ -654,7 +654,7 @@
float val = 0.0f;
val += value;
- val += 0.1f * m_da.getFloatValueFromString(decimal_part, 0.0f);
+ val += 0.1f * dataAccess.getFloatValueFromString(decimal_part, 0.0f);
return val;
}
@@ -669,7 +669,7 @@
{
if (!ATDataAccessAbstract.isEmptyOrUnset(val))
{
- setIns1(m_da.getIntValue(val));
+ setIns1(dataAccess.getIntValue(val));
}
}
@@ -718,7 +718,7 @@
{
if (!ATDataAccessAbstract.isEmptyOrUnset(val))
{
- setIns2(m_da.getIntValue(val));
+ setIns2(dataAccess.getIntValue(val));
}
else
{
@@ -771,7 +771,7 @@
*/
public void setCH(String val)
{
- setCH(m_da.getFloatValue(val));
+ setCH(dataAccess.getFloatValue(val));
}
@@ -808,7 +808,7 @@
*/
public float getIns3()
{
- return m_da.getFloatValueFromString(this.getExtendedValue(ExtendedDailyValueType.Insulin3), 0.0f);
+ return dataAccess.getFloatValueFromString(this.getExtendedValue(ExtendedDailyValueType.Insulin3), 0.0f);
}
@@ -859,7 +859,7 @@
public String getBasalInsulinAsString()
{
- return m_da.getDecimalHandler().getDecimalNumberAsString(this.getBasalInsulin(), 1);
+ return dataAccess.getDecimalHandler().getDecimalNumberAsString(this.getBasalInsulin(), 1);
}
@@ -888,7 +888,7 @@
public String getBolusInsulinAsString()
{
- return m_da.getDecimalHandler().getDecimalNumberAsString(this.getBolusInsulin(), 1);
+ return dataAccess.getDecimalHandler().getDecimalNumberAsString(this.getBolusInsulin(), 1);
}
@@ -1041,12 +1041,12 @@
m_dv.setBg(bg);
m_dv.setCh(ch);
m_dv.setComment(comment);
- m_dv.setDt_info(datetime.getATDateTimeAsLong());
+ m_dv.setDtInfo(datetime.getATDateTimeAsLong());
m_dv.setIns1(ins1);
m_dv.setIns2(ins2);
m_dv.setExtended(this.getExtendedHandler().saveExtended(mapExtended));
- m_dv.setPerson_id((int) m_da.getCurrentUserId());
- m_dv.setMeals_ids(this.meals);
+ m_dv.setPersonId((int) dataAccess.getCurrentUserId());
+ m_dv.setMealsIds(this.meals);
}
else
{
@@ -1053,12 +1053,12 @@
m_dv.setBg(bg);
m_dv.setCh(ch);
m_dv.setComment(comment);
- m_dv.setDt_info(datetime.getATDateTimeAsLong());
+ m_dv.setDtInfo(datetime.getATDateTimeAsLong());
m_dv.setIns1(ins1);
m_dv.setIns2(ins2);
m_dv.setExtended(this.getExtendedHandler().saveExtended(mapExtended));
- m_dv.setPerson_id((int) m_da.getCurrentUserId());
- m_dv.setMeals_ids(this.meals);
+ m_dv.setPersonId((int) dataAccess.getCurrentUserId());
+ m_dv.setMealsIds(this.meals);
}
return m_dv;
@@ -1088,7 +1088,7 @@
if (fl == 0.0)
return "";
else
- return DataAccess.Decimal1Format.format(fl);
+ return dataAccess.getFloatAsString(fl, 1);
}
@@ -1097,7 +1097,7 @@
if (fl == 0.0)
return "";
else
- return DataAccess.Decimal2Format.format(fl);
+ return dataAccess.getFloatAsString(fl, 2);
}
@@ -1122,9 +1122,9 @@
return "";
return this.getBGAsString();
case 2:
- return DataAccess.getFloatAsString(this.getBolusInsulin(), 1);
+ return dataAccess.getFloatAsString(this.getBolusInsulin(), 1);
case 3:
- return DataAccess.getFloatAsString(this.getBasalInsulin(), 1);
+ return dataAccess.getFloatAsString(this.getBasalInsulin(), 1);
case 4:
return this.getFloat2AsString(ch);
case 5:
@@ -1173,7 +1173,7 @@
public ExtendedEnumHandler getExtendedHandler()
{
- return (ExtendedEnumHandler) m_da.getExtendedHandler("DailyValuesRow");
+ return (ExtendedEnumHandler) dataAccess.getExtendedHandler("DailyValuesRow");
}
Added: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DataValuesInterface.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DataValuesInterface.java (rev 0)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/DataValuesInterface.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -0,0 +1,26 @@
+package ggc.core.data;
+
+/**
+ * Created by andy on 28.01.17.
+ */
+public interface DataValuesInterface
+{
+
+ int getColumnCount();
+
+
+ int getRowCount();
+
+
+ Object getValueAt(int row, int column);
+
+
+ String getColumnName(int column);
+
+
+ Class<?> getColumnClass(int row);
+
+
+ boolean isCellEditable(int row, int col);
+
+}
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/ExtendedRatioCollection.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/ExtendedRatioCollection.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/ExtendedRatioCollection.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -4,7 +4,7 @@
import java.util.Hashtable;
import ggc.core.util.DataAccess;
-import ggc.shared.ratio.RatioEntry;
+import ggc.gui.dialogs.ratio.RatioEntry;
/**
* Application: GGC - GNU Gluco Control
@@ -36,11 +36,13 @@
DataAccess m_da = DataAccess.getInstance();
+
public ExtendedRatioCollection()
{
super();
}
+
public void load()
{
@@ -75,6 +77,7 @@
}
}
+
public RatioEntry getRatioEntryByTime(String time)
{
long t = Long.parseLong(time.replace(":", ""));
@@ -88,6 +91,7 @@
return null;
}
+
public boolean save()
{
return m_da.getDb().saveExtendedRatioEntries(this);
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/GlucoValues.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/GlucoValues.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/GlucoValues.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -4,6 +4,7 @@
import com.atech.utils.data.ATechDate;
import com.atech.utils.data.TimeZoneUtil;
+
import ggc.core.util.DataAccess;
/**
@@ -38,7 +39,7 @@
// private static final long serialVersionUID = 3904480643937213485L;
Vector<DailyValues> dayValues = null;
- ArrayList<DailyValuesRow> dayValuesRows = null;
+ List<DailyValuesRow> dayValuesRows = null;
// private DataAccess dataAccess = DataAccess.getInstance();
GregorianCalendar from_date;
GregorianCalendar to_date;
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigCellRenderer.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigCellRenderer.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigCellRenderer.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -1,12 +1,11 @@
package ggc.core.data.cfg;
-import ggc.core.util.DataAccess;
+import java.awt.*;
-import java.awt.Component;
+import javax.swing.*;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
-import javax.swing.SwingConstants;
+import ggc.core.enums.PropertiesDialogType;
+import ggc.core.util.DataAccess;
/**
* Application: GGC - GNU Gluco Control
@@ -38,7 +37,16 @@
private static final long serialVersionUID = -2728552153803274776L;
DataAccess da = DataAccess.getInstance();
+ PropertiesDialogType propertiesDialogType;
+
+ public ConfigCellRenderer(PropertiesDialogType propertiesDialogType)
+ {
+ super();
+ this.propertiesDialogType = propertiesDialogType;
+ }
+
+
@Override
@SuppressWarnings("rawtypes")
public Component getListCellRendererComponent(JList list, Object value, // value
@@ -49,7 +57,11 @@
boolean chf) // the list and the cell have the focus
{
super.getListCellRendererComponent(list, value, index, iss, chf);
- setIcon(da.config_icons[index]);
+ if (propertiesDialogType == PropertiesDialogType.Standard)
+ setIcon(da.config_icons[index]);
+ else
+ setIcon(da.config_icons[index == 1 ? 10 : 0]); // we have only two
+ // icons here
this.setHorizontalTextPosition(SwingConstants.CENTER);
this.setHorizontalAlignment(SwingConstants.CENTER);
this.setVerticalTextPosition(SwingConstants.BOTTOM);
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigurationManager.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigurationManager.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigurationManager.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -1,7 +1,7 @@
package ggc.core.data.cfg;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,7 +119,7 @@
"USE_CGMS_DATA_IN_DAILY_PEN_DISPLAY", "false", //
};
- Hashtable<String, Settings> cfg_values = new Hashtable<String, Settings>();
+ Map<String, Settings> cfg_values = new HashMap<String, Settings>();
DataAccess m_da = null;
@@ -130,7 +130,7 @@
}
- public void checkConfiguration(Hashtable<String, Settings> values, GGCDb db)
+ public void checkConfiguration(Map<String, Settings> values, GGCDb db)
{
this.cfg_values = values;
@@ -192,7 +192,7 @@
s.setDescription(m_da.getI18nControlInstance().getMessage("CFG_" + name));
s.setType(parameterType);
s.setValue(defaultValue);
- s.setPerson_id((int) m_da.getCurrentUserId());
+ s.setPersonId((int) m_da.getCurrentUserId());
db.add(s);
@@ -382,19 +382,15 @@
GGCDb db = this.m_da.getDb();
- for (Enumeration<String> en = this.cfg_values.keys(); en.hasMoreElements();)
+ for (Settings setting : this.cfg_values.values())
{
- String key = en.nextElement();
-
- Settings s = this.cfg_values.get(key);
-
- if (s.isElementAdded())
+ if (setting.isElementAdded())
{
- db.add(s);
+ db.add(setting);
}
- else if (s.isElementEdited())
+ else if (setting.isElementEdited())
{
- db.edit(s);
+ db.edit(setting);
}
}
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigurationManagerWrapper.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigurationManagerWrapper.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/cfg/ConfigurationManagerWrapper.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -7,7 +7,9 @@
import org.slf4j.LoggerFactory;
import com.atech.graphics.graphs.GraphConfigProperties;
+
import ggc.core.data.defs.GlucoseUnitType;
+import ggc.core.util.GGCSoftwareMode;
/**
* Created by andy on 10.10.15.
@@ -1079,6 +1081,12 @@
}
+ public GGCSoftwareMode getSoftwareModeType()
+ {
+ return GGCSoftwareMode.getEnum(getIntValue("SW_MODE"));
+ }
+
+
public float getPenMaxBasal()
{
return getFloatValue("PEN_MAX_BASAL");
Added: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/DatabaseStatusType.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/DatabaseStatusType.java (rev 0)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/DatabaseStatusType.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -0,0 +1,51 @@
+package ggc.core.data.defs;
+
+public enum DatabaseStatusType
+{
+ Stopped(0), // 0 - NU
+ InitDone(1), // 1
+ BaseDone(2), // 2
+ ExtendedDone(3), // 3 - NU
+ Loaded(3), // 3
+
+ ;
+
+ int code;
+
+
+ DatabaseStatusType(int code)
+ {
+ this.code = code;
+ }
+
+
+ public int getCode()
+ {
+ return this.code;
+ }
+
+ /**
+ * Db Status: Stopped
+ */
+ public static final int DB_STOPPED = 0;
+
+ /**
+ * Db Status: Init done
+ */
+ public static final int DB_INIT_DONE = 1;
+
+ /**
+ * Db Status: Base done
+ */
+ public static final int DB_BASE_DONE = 2;
+
+ /**
+ * Db Status: Extended done
+ */
+ public static final int DB_EXTENDED_DONE = 3;
+
+ /**
+ * Db Status: Loaded
+ */
+ public static final int DB_LOADED = 3;
+}
Added: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/GGCObservableType.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/GGCObservableType.java (rev 0)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/GGCObservableType.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -0,0 +1,35 @@
+package ggc.core.data.defs;
+
+import com.atech.graphics.observe.ObservableType;
+
+/**
+ * Created by andy on 04.01.17.
+ */
+public enum GGCObservableType implements ObservableType
+{
+ InfoPanels, //
+ Status, //
+ Database, //
+ ;
+
+ public String getKey()
+ {
+ return this.name();
+ }
+
+ /**
+ * Observable: Panels
+ */
+ public static final int OBSERVABLE_PANELS = 1;
+
+ /**
+ * Observable: Status
+ */
+ public static final int OBSERVABLE_STATUS = 2;
+
+ /**
+ * Observable: Db
+ */
+ public static final int OBSERVABLE_DB = 3;
+
+}
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/GlucoseUnitType.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/GlucoseUnitType.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/GlucoseUnitType.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -41,6 +41,7 @@
int code;
String i18nKey;
String translation;
+ static String[] descriptions;
static Hashtable<Integer, GlucoseUnitType> codeMapping = new Hashtable<Integer, GlucoseUnitType>();
@@ -59,10 +60,16 @@
{
pbt.setTranslation(ic.getMessage(pbt.i18nKey));
}
+
+ String[] unitDescriptions = { ic.getMessage("GLUCOSE_UNIT_MGDL"), //
+ ic.getMessage("GLUCOSE_UNIT_MMOLL"), //
+ };
+
+ descriptions = unitDescriptions;
}
- private GlucoseUnitType(int code, String i18nKey)
+ GlucoseUnitType(int code, String i18nKey)
{
this.code = code;
this.i18nKey = i18nKey;
@@ -111,4 +118,10 @@
}
}
+
+ public static String[] getDescriptions()
+ {
+ return descriptions;
+ }
+
}
Copied: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryGroupType.java (from rev 1456, trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/StockTypeBase.java)
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryGroupType.java (rev 0)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryGroupType.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -0,0 +1,169 @@
+package ggc.core.data.defs;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.atech.i18n.I18nControlAbstract;
+import com.atech.utils.ATDataAccessAbstract;
+import com.atech.utils.data.CodeEnumWithTranslation;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: StockTypeBase
+ * Description: Stock Type Base
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public enum InventoryGroupType implements CodeEnumWithTranslation
+{
+ None(0, "NONE"), //
+ Insulin(1, "STOCKTYPE_INSULIN"), //
+ BG(2, "STOCKTYPE_BG"), //
+ Pen(3, "STOCKTYPE_PEN"), //
+ Pump(4, "STOCKTYPE_PUMP"), //
+ CGMS(5, "STOCKTYPE_CGMS");
+
+ static String[] descriptions;
+
+ static Map<String, CodeEnumWithTranslation> translationMapping = new HashMap<String, CodeEnumWithTranslation>();
+ static Map<Integer, InventoryGroupType> codeMapping = new HashMap<Integer, InventoryGroupType>();
+
+ static
+ {
+ for (InventoryGroupType pbt : values())
+ {
+ codeMapping.put(pbt.code, pbt);
+ }
+
+ }
+
+ int code;
+ String i18nKey;
+ String translation;
+
+
+ InventoryGroupType(int code, String i18nKey)
+ {
+ this.code = code;
+ this.i18nKey = i18nKey;
+ }
+
+
+ public static void translateKeywords(I18nControlAbstract ic)
+ {
+ for (InventoryGroupType pbt : values())
+ {
+ pbt.setTranslation(ic.getMessage(pbt.i18nKey));
+ translationMapping.put(pbt.getTranslation(), pbt);
+ }
+
+ String[] stockTypeDescriptions = { ic.getMessage("STOCKTYPE_ANY"), //
+ ic.getMessage("STOCKTYPE_INSULIN"), //
+ ic.getMessage("STOCKTYPE_BG"), //
+ ic.getMessage("STOCKTYPE_PEN"), //
+ ic.getMessage("STOCKTYPE_PUMP"), //
+ ic.getMessage("STOCKTYPE_CGMS"), //
+ };
+
+ descriptions = stockTypeDescriptions;
+ }
+
+
+ public String getTranslation()
+ {
+ return translation;
+ }
+
+
+ public void setTranslation(String translation)
+ {
+ this.translation = translation;
+ }
+
+
+ public int getCode()
+ {
+ return code;
+ }
+
+
+ public String getI18nKey()
+ {
+ return i18nKey;
+ }
+
+
+ public String getName()
+ {
+ return this.name();
+ }
+
+
+ /**
+ * Get Type from Description
+ *
+ * @param str
+ * type as string
+ * @return type as int
+ */
+ public static int getTypeFromDescription(String str)
+ {
+ return ATDataAccessAbstract.getTypeFromDescription(str, translationMapping);
+ }
+
+
+ public static InventoryGroupType getByCode(int code)
+ {
+ if (codeMapping.containsKey(code))
+ {
+ return codeMapping.get(code);
+ }
+ else
+ {
+ return InventoryGroupType.None;
+ }
+ }
+
+
+ /**
+ * Get Type from Description
+ *
+ * @param str
+ * type as string
+ * @return type as int
+ */
+ public static InventoryGroupType getByDescription(String str)
+ {
+ return getByCode(ATDataAccessAbstract.getTypeFromDescription(str, translationMapping));
+ }
+
+
+ /**
+ * Get Descriptions (array)
+ *
+ * @return array of strings with description
+ */
+ public static String[] getDescriptions()
+ {
+ return descriptions;
+ }
+
+}
Added: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryItemUnit.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryItemUnit.java (rev 0)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryItemUnit.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -0,0 +1,149 @@
+package ggc.core.data.defs;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.atech.i18n.I18nControlAbstract;
+import com.atech.utils.ATDataAccessAbstract;
+import com.atech.utils.data.CodeEnumWithTranslation;
+
+public enum InventoryItemUnit implements CodeEnumWithTranslation
+{
+
+ None(0, "NONE"), //
+ Unit(1, "UNIT_UNIT"), //
+ ML(2, "UNIT_ML"), //
+ Pieces(3, "UNIT_PIECES"), //
+ ;
+
+ static String[] descriptions;
+
+ static Map<String, CodeEnumWithTranslation> translationMapping = new HashMap<String, CodeEnumWithTranslation>();
+ static Map<Integer, InventoryItemUnit> codeMapping = new HashMap<Integer, InventoryItemUnit>();
+ static Map<String, CodeEnumWithTranslation> keyMapping = new HashMap<String, CodeEnumWithTranslation>();
+
+ static
+ {
+ for (InventoryItemUnit pbt : values())
+ {
+ keyMapping.put(pbt.i18nKey, pbt);
+ codeMapping.put(pbt.code, pbt);
+ }
+ }
+
+ int code;
+ String i18nKey;
+ String translation;
+
+
+ InventoryItemUnit(int code, String i18nKey)
+ {
+ this.code = code;
+ this.i18nKey = i18nKey;
+ }
+
+
+ public static void translateKeywords(I18nControlAbstract ic)
+ {
+ for (InventoryItemUnit pbt : values())
+ {
+ pbt.setTranslation(ic.getMessage(pbt.i18nKey));
+ translationMapping.put(pbt.getTranslation(), pbt);
+ }
+
+ String[] stockUnitDescriptions = { ic.getMessage("SELECT"), //
+ ic.getMessage("UNIT_UNIT"), //
+ ic.getMessage("UNIT_ML"), //
+ ic.getMessage("UNIT_PIECES"), //
+ };
+
+ descriptions = stockUnitDescriptions;
+ }
+
+
+ public String getTranslation()
+ {
+ return translation;
+ }
+
+
+ public void setTranslation(String translation)
+ {
+ this.translation = translation;
+ }
+
+
+ public int getCode()
+ {
+ return code;
+ }
+
+
+ public String getI18nKey()
+ {
+ return i18nKey;
+ }
+
+
+ public String getName()
+ {
+ return this.name();
+ }
+
+
+ /**
+ * Get Type from Description
+ *
+ * @param str
+ * type as string
+ * @return type as int
+ */
+ public static int getTypeFromDescription(String str)
+ {
+ return ATDataAccessAbstract.getTypeFromDescription(str, translationMapping);
+ }
+
+
+ public static InventoryItemUnit getByCode(int code)
+ {
+ if (codeMapping.containsKey(code))
+ {
+ return codeMapping.get(code);
+ }
+ else
+ {
+ return InventoryItemUnit.None;
+ }
+ }
+
+
+ /**
+ * Get Type from Description
+ *
+ * @param str
+ * type as string
+ * @return type as int
+ */
+ public static InventoryItemUnit getByDescription(String str)
+ {
+ return getByCode(ATDataAccessAbstract.getTypeFromDescription(str, translationMapping));
+ }
+
+
+ public static InventoryItemUnit getByI18nKey(String str)
+ {
+ return getByCode(ATDataAccessAbstract.getTypeFromDescription(str, keyMapping));
+ }
+
+
+ /**
+ * Get Descriptions (array)
+ *
+ * @return array of strings with description
+ */
+ public static String[] getDescriptions()
+ {
+ return descriptions;
+ }
+
+}
Copied: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryItemUsageUnit.java (from rev 1456, trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/StockUsageUnit.java)
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryItemUsageUnit.java (rev 0)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/InventoryItemUsageUnit.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -0,0 +1,155 @@
+package ggc.core.data.defs;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.atech.i18n.I18nControlAbstract;
+import com.atech.utils.ATDataAccessAbstract;
+import com.atech.utils.data.CodeEnumWithTranslation;
+
+import ggc.core.util.DataAccess;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ *
+ * See AUTHORS for copyright information.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Filename: InventoryItemUsageUnit
+ * Description: Stock Usage Unit
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public enum InventoryItemUsageUnit implements CodeEnumWithTranslation
+{
+ None(0, "NONE"), //
+ Day(1, "TIME_DAY"), //
+ Week(2, "TIME_WEEK"), //
+ Month(3, "TIME_MONTH"), //
+
+ ;
+
+ static String[] descriptions;
+
+ static Map<String, CodeEnumWithTranslation> translationMapping = new HashMap<String, CodeEnumWithTranslation>();
+ static Map<Integer, InventoryItemUsageUnit> codeMapping = new HashMap<Integer, InventoryItemUsageUnit>();
+
+ static
+ {
+ I18nControlAbstract ic = DataAccess.getInstance().getI18nControlInstance();
+
+ for (InventoryItemUsageUnit pbt : values())
+ {
+ pbt.setTranslation(ic.getMessage(pbt.i18nKey));
+ translationMapping.put(pbt.getTranslation(), pbt);
+ codeMapping.put(pbt.code, pbt);
+ }
+
+ String[] basal_desc_lcl = { ic.getMessage("SELECT"), //
+ ic.getMessage("TIME_DAY"), //
+ ic.getMessage("TIME_WEEK"), //
+ ic.getMessage("TIME_MONTH"), //
+ };
+
+ descriptions = basal_desc_lcl;
+ }
+
+ int code;
+ String i18nKey;
+ String translation;
+
+
+ private InventoryItemUsageUnit(int code, String i18nKey)
+ {
+ this.code = code;
+ this.i18nKey = i18nKey;
+ }
+
+
+ public String getTranslation()
+ {
+ return translation;
+ }
+
+
+ public void setTranslation(String translation)
+ {
+ this.translation = translation;
+ }
+
+
+ public int getCode()
+ {
+ return code;
+ }
+
+
+ public String getI18nKey()
+ {
+ return i18nKey;
+ }
+
+
+ public String getName()
+ {
+ return this.name();
+ }
+
+
+ /**
+ * Get Type from Description
+ *
+ * @param str
+ * type as string
+ * @return type as int
+ */
+ public static int getTypeFromDescription(String str)
+ {
+ return ATDataAccessAbstract.getTypeFromDescription(str, translationMapping);
+ }
+
+
+ public static InventoryItemUsageUnit getByCode(int code)
+ {
+ if (codeMapping.containsKey(code))
+ {
+ return codeMapping.get(code);
+ }
+ else
+ {
+ return InventoryItemUsageUnit.Day;
+ }
+ }
+
+
+ public static InventoryItemUsageUnit getByDescription(String description)
+ {
+ return getByCode(getTypeFromDescription(description));
+ }
+
+
+ /**
+ * Get Descriptions (array)
+ *
+ * @return array of strings with description
+ */
+ public static String[] getDescriptions()
+ {
+ return descriptions;
+ }
+
+}
Added: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/RefreshInfoType.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/RefreshInfoType.java (rev 0)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/RefreshInfoType.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -0,0 +1,52 @@
+package ggc.core.data.defs;
+
+/**
+ * Created by andy on 04.01.17.
+ */
+public enum RefreshInfoType
+{
+ DevicesConfiguration(1), // PANEL_GROUP_PLUGINS_DEVICES
+ DeviceDataAll(2), // PANEL_GROUP_ALL_DATA
+ GeneralInfo(3), // PANEL_GROUP_GENERAL_INFO
+ PluginsAll(4), // PANEL_GROUP_PLUGINS_ALL
+ DeviceDataMeter(2), //
+ DeviceDataCGMS(2), //
+ DeviceDataPump(2), //
+ Appointments(5), //
+ Inventory(6);
+
+ int code;
+
+
+ RefreshInfoType(int code)
+ {
+ this.code = code;
+ }
+
+
+ public int getCode()
+ {
+ return this.code;
+ }
+
+ /**
+ * Panel Group - Plugins Devices
+ */
+ public static final int PANEL_GROUP_PLUGINS_DEVICES = 1;
+
+ /**
+ * Panel Group - All Data (HbA1c and Statistics)
+ */
+ public static final int PANEL_GROUP_ALL_DATA = 2;
+
+ /**
+ * Panel Group - General Info
+ */
+ public static final int PANEL_GROUP_GENERAL_INFO = 3;
+
+ /**
+ * Panel Group - Plugins All
+ */
+ public static final int PANEL_GROUP_PLUGINS_ALL = 4;
+
+}
Added: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/ReturnActionType.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/ReturnActionType.java (rev 0)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/ReturnActionType.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -0,0 +1,12 @@
+package ggc.core.data.defs;
+
+import com.atech.plugin.PluginActionType;
+
+/**
+ * Created by andy on 04.01.17.
+ */
+public enum ReturnActionType implements PluginActionType
+{
+ ReadData, //
+ ChangeConfig, //
+}
Modified: trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/StockTypeBase.java
===================================================================
--- trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/StockTypeBase.java 2016-12-26 14:02:38 UTC (rev 1456)
+++ trunk/ggc-core-app/ggc-core/src/main/java/ggc/core/data/defs/StockTypeBase.java 2017-06-19 18:10:37 UTC (rev 1457)
@@ -6,7 +6,6 @@
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.ATDataAccessAbstract;
import com.atech.utils.data.CodeEnumWithTranslation;
-import ggc.core.util.DataAccess;
/**
* Application: GGC - GNU Gluco Control
@@ -32,7 +31,7 @@
*
* Author: Andy {an...@at...}
*/
-
+@Deprecated
public enum StockTypeBase implements CodeEnumWithTranslation
{
None(0, "NONE"), //
@@ -49,24 +48,11 @@
static
{
- I18nControlAbstract ic = DataAccess.getInstance().getI18nControlInstance();
-
...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X