Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[733] trunk
|
From: <and...@us...> - 2009-04-04 21:11:12
|
Revision: 733
http://ggc.svn.sourceforge.net/ggc/?rev=733&view=rev
Author: andyrozman
Date: 2009-04-04 21:11:01 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc-cgm/build/build.xml
trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java
trunk/ggc-core/build/GGCBuild.properties
trunk/ggc-core/build/build.xml
trunk/ggc-desktop/.classpath
trunk/ggc-desktop/build/GGC_Desktop_Version.properties
trunk/ggc-desktop/build/build.xml
trunk/ggc-desktop/data/update/GGC_Update.properties
trunk/ggc-desktop/src/ggc/gui/MainFrame.java
trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java
trunk/ggc-meter/build/build.xml
trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
trunk/ggc-pump/build/build.xml
trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java
trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java
trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java
trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java
trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
Added Paths:
-----------
trunk/ggc-desktop/build/manifest_ggc.mf
trunk/ggc-desktop/build/manifest_ggc_little.mf
Property Changed:
----------------
trunk/ggc-desktop/data/
Modified: trunk/ggc-cgm/build/build.xml
===================================================================
--- trunk/ggc-cgm/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-cgm/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -5,6 +5,8 @@
</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="./GGCCGMSToolVersion.properties"/>
@@ -70,6 +72,7 @@
<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>
Modified: trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -337,11 +337,13 @@
}
+ /**
+ * Load PlugIns
+ */
@Override
public void loadPlugIns()
{
// TODO Auto-generated method stub
-
}
Modified: trunk/ggc-core/build/GGCBuild.properties
===================================================================
--- trunk/ggc-core/build/GGCBuild.properties 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-core/build/GGCBuild.properties 2009-04-04 21:11:01 UTC (rev 733)
@@ -83,6 +83,12 @@
jfreechart.api=${jfreechart.path}/jcommon-1.0.13.jar;${jfreechart.path}/jcommon-xml-1.0.13.jar;${jfreechart.path}/jfreechart-1.0.10.jar
#
+# iText 2.0.7
+#
+iText.api=${utils_path}/iText-2.0.7.jar
+
+
+#
# This is tempory class path entry which is used for developers, which are trying out new apis. If api is
# apporoved it will be added under static_apis_cpath
#
@@ -95,7 +101,7 @@
#
# utils cpath
-utils_cpath=${utils_path}/iText-2.0.7.jar;${utils_path}/skinlf-6.7.jar;
+utils_cpath=${iText.api};${utils_path}/skinlf-6.7.jar;
# hibernate cpath
hibernate_cpath=${hibernate_path}/asm.jar;${hibernate_path}/asm-attrs.jar;${hibernate_path}/c3p0-0.9.0.jar;${hibernate_path}/cglib-2.1.3.jar;${hibernate_path}/commons-collections-2.1.1.jar;${hibernate_path}/commons-logging-1.0.4.jar;${hibernate_path}/dom4j-1.6.1.jar;${hibernate_path}/hibernate3.jar;${hibernate_path}/jdbc2_0-stdext.jar;${hibernate_path}/jta.jar;${hibernate_path}/log4j-1.2.11.jar;${hibernate_path}/ehcache-1.1.jar;${hibernate_path}/commons-lang-2.0.jar;${hibernate_path}/antlr-2.7.6rc1.jar
Modified: trunk/ggc-core/build/build.xml
===================================================================
--- trunk/ggc-core/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-core/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -92,6 +92,7 @@
<fileset dir="${build.dir}">
<include name="ggc/core/**"/>
+ <include name="ggc/shared/**"/>
<include name="*.hbm.xml"/>
<exclude name="ggc/gui/**"/>
</fileset>
Modified: trunk/ggc-desktop/.classpath
===================================================================
--- trunk/ggc-desktop/.classpath 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/.classpath 2009-04-04 21:11:01 UTC (rev 733)
@@ -17,5 +17,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ggc-web"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jfreechart-1.0.10"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/GGC Nutrition Tool"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/ggc-desktop/build/GGC_Desktop_Version.properties
===================================================================
--- trunk/ggc-desktop/build/GGC_Desktop_Version.properties 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/build/GGC_Desktop_Version.properties 2009-04-04 21:11:01 UTC (rev 733)
@@ -7,7 +7,7 @@
#
# Main GUI Version (this version is same as Core always)
#
-ggc-main.version=0.4.3
+ggc-main.version=0.4.4.2
#
Modified: trunk/ggc-desktop/build/build.xml
===================================================================
--- trunk/ggc-desktop/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -180,17 +180,5 @@
</target>
- <target name="hbm2java" description="Generate .java from .hbm files." >
- <taskdef name="hbm2java"
- classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
- classpath="${hibernate.all.classpath.dir}"/>
- <hbm2java output="${source.dir}/hib_new/" >
- <fileset dir="${source.dir}">
- <include name="**/*.hbm.xml"/>
- </fileset>
- </hbm2java>
- </target>
-
-
</project>
Added: trunk/ggc-desktop/build/manifest_ggc.mf
===================================================================
--- trunk/ggc-desktop/build/manifest_ggc.mf (rev 0)
+++ trunk/ggc-desktop/build/manifest_ggc.mf 2009-04-04 21:11:01 UTC (rev 733)
@@ -0,0 +1 @@
+Main-Class: ggc.GGC
Added: trunk/ggc-desktop/build/manifest_ggc_little.mf
===================================================================
--- trunk/ggc-desktop/build/manifest_ggc_little.mf (rev 0)
+++ trunk/ggc-desktop/build/manifest_ggc_little.mf 2009-04-04 21:11:01 UTC (rev 733)
@@ -0,0 +1 @@
+Main-Class: ggc.gui.little.GGCLittle
Property changes on: trunk/ggc-desktop/data
___________________________________________________________________
Modified: svn:ignore
- db
log
temp
import
db2
export
nutrition
+ db
log
temp
import
db2
export
nutrition
print
Modified: trunk/ggc-desktop/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc-desktop/data/update/GGC_Update.properties 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/data/update/GGC_Update.properties 2009-04-04 21:11:01 UTC (rev 733)
@@ -56,7 +56,7 @@
#
# Components
#
-LAST_COMPONENT=19
+LAST_COMPONENT=20
#
@@ -73,17 +73,17 @@
COMPONENT_1_GROUP=1
COMPONENT_1_NAME=GGC Main
-COMPONENT_1_VERSION=0.4.3
-COMPONENT_1_VERSION_NUM=3
+COMPONENT_1_VERSION=0.4.4.2
+COMPONENT_1_VERSION_NUM=4
COMPONENT_1_ROOT_DIR=/lib/ggc
-COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.3.jar
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.4.2.jar
COMPONENT_2_GROUP=1
COMPONENT_2_NAME=GGC Core
-COMPONENT_2_VERSION=0.4.3
-COMPONENT_2_VERSION_NUM=3
+COMPONENT_2_VERSION=0.4.4.1
+COMPONENT_2_VERSION_NUM=4
COMPONENT_2_ROOT_DIR=/lib/ggc
-COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.3.jar
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.4.1.jar
COMPONENT_3_GROUP=1
COMPONENT_3_NAME=GGC Little
@@ -95,34 +95,41 @@
COMPONENT_4_GROUP=1
COMPONENT_4_NAME=GGC Lang
-COMPONENT_4_VERSION=0.3.1
-COMPONENT_4_VERSION_NUM=2
+COMPONENT_4_VERSION=0.3.4
+COMPONENT_4_VERSION_NUM=3
COMPONENT_4_ROOT_DIR=/lib/ggc
-COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.1.jar
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.4.jar
COMPONENT_5_GROUP=2
COMPONENT_5_NAME=GGC Plugin Base
-COMPONENT_5_VERSION=0.2.7
-COMPONENT_5_VERSION_NUM=2
+COMPONENT_5_VERSION=0.3.1
+COMPONENT_5_VERSION_NUM=3
COMPONENT_5_ROOT_DIR=/lib/ggc
-COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.2.7.jar
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.3.1.jar
+COMPONENT_20_GROUP=2
+COMPONENT_20_NAME=Nutrition Tool
+COMPONENT_6_VERSION=1.1.1
+COMPONENT_6_VERSION_NUM=1
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-nutri_tool-1.1.1.jar
+
COMPONENT_6_GROUP=2
COMPONENT_6_NAME=Meter Tool
-COMPONENT_6_VERSION=1.0.7
-COMPONENT_6_VERSION_NUM=2
+COMPONENT_6_VERSION=1.0.8
+COMPONENT_6_VERSION_NUM=3
COMPONENT_6_ROOT_DIR=/lib/ggc
-COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.0.7.jar
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.0.8.jar
COMPONENT_7_GROUP=2
COMPONENT_7_NAME=Pump Tool
-COMPONENT_7_VERSION=0.2.1
-COMPONENT_7_VERSION_NUM=1
+COMPONENT_7_VERSION=0.4.1
+COMPONENT_7_VERSION_NUM=2
COMPONENT_7_ROOT_DIR=/lib/ggc
-COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-0.2.1.jar
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-0.4.1.jar
COMPONENT_8_GROUP=2
@@ -151,10 +158,10 @@
COMPONENT_11_GROUP=3
COMPONENT_11_NAME=Atech Tools
-COMPONENT_11_VERSION=0.3.5
-COMPONENT_11_VERSION_NUM=4
+COMPONENT_11_VERSION=0.3.6
+COMPONENT_11_VERSION_NUM=5
COMPONENT_11_ROOT_DIR=/lib/utils
-COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.5.jar
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.6.jar
COMPONENT_12_GROUP=3
COMPONENT_12_NAME=iText Pdf Library
Modified: trunk/ggc-desktop/src/ggc/gui/MainFrame.java
===================================================================
--- trunk/ggc-desktop/src/ggc/gui/MainFrame.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/src/ggc/gui/MainFrame.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -110,7 +110,7 @@
// private JLabel lblTest = new JLabel();
- private JMenu menu_file, menu_bgs, menu_food, menu_doctor, menu_printing, menu_tools, menu_help, menu_meters, menu_pumps, menu_data_graphs, menu_cgms /* , menu_misc */;
+ private JMenu menu_file, menu_bgs, /*menu_food,*/ menu_doctor, menu_printing, menu_tools, menu_help, menu_meters, menu_pumps, menu_data_graphs, menu_cgms /* , menu_misc */;
private Hashtable<String, GGCAction> actions = null;
private Hashtable<String, GGCAction> toolbar_items = null;
@@ -432,6 +432,21 @@
{
this.menuBar.add(pic.getPlugInMainMenu());
}
+
+ if (pic.getPlugInPrintMenus()!=null)
+ {
+ System.out.println("Menus found: ");
+ JMenu[] menus = pic.getPlugInPrintMenus();
+
+ for(int i=0; i<menus.length; i++)
+ {
+ this.menu_printing.add(menus[i]);
+ }
+
+ }
+ else
+ System.out.println("Menus NOT found: ");
+
}
//System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
@@ -1231,6 +1246,9 @@
return "MainFrame";
}
+ /**
+ * Update
+ */
public void update(Observable obj, Object arg)
{
if (arg instanceof Integer)
@@ -1244,7 +1262,7 @@
}
- public void refreshMenus()
+ private void refreshMenus()
{
System.out.println("Refresh Menus: ");
this.menuBar.removeAll();
@@ -1266,8 +1284,52 @@
this.menuBar.add(this.menu_doctor);
// reports menu
+
+
+ for(Enumeration<String> en= m_da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+ //System.out.println("Key=" + key);
+
+ PlugInClient pic = m_da.getPlugIn(key);
+
+ if (pic.getPlugInPrintMenus()!=null)
+ {
+ //System.out.println("Menus found: ");
+ JMenu[] menus = pic.getPlugInPrintMenus();
+
+ for(int i=0; i<menus.length; i++)
+ {
+ this.menu_printing.add(menus[i]);
+ }
+
+ }
+ //else
+ // System.out.println("Menus NOT found: ");
+
+ }
+
+
this.menuBar.add(this.menu_printing);
+
+ for(Enumeration<String> en= m_da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+
+ if (key.equals(DataAccess.PLUGIN_NUTRITION))
+ continue;
+
+ PlugInClient pic = m_da.getPlugIn(key);
+
+ if (pic.getPlugInMainMenu()!=null)
+ {
+ this.menuBar.add(pic.getPlugInMainMenu());
+ }
+ }
+
+
+
this.menuBar.add(this.menu_meters);
this.menuBar.add(this.menu_pumps);
this.menuBar.add(this.menu_cgms);
@@ -1294,19 +1356,14 @@
}
}*/
- System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ //System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
}
- public JMenu getPlugInMenu(String name)
+ private JMenu getPlugInMenu(String name)
{
PlugInClient pic = m_da.getPlugIn(name);
-
- System.out.println("PIC: " + pic + " = " + pic.getPlugInMainMenu());
-
-
-
return pic.getPlugInMainMenu();
}
Modified: trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java
===================================================================
--- trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -252,6 +252,8 @@
}
+
+ @SuppressWarnings("unused")
private void initRange() // throws Exception
{
Modified: trunk/ggc-meter/build/build.xml
===================================================================
--- trunk/ggc-meter/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-meter/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -5,10 +5,13 @@
</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"/>
+
<!-- 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"/>
@@ -70,6 +73,7 @@
<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>
Modified: trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -414,11 +414,13 @@
}
+ /**
+ * Load PlugIns
+ */
@Override
public void loadPlugIns()
{
// TODO Auto-generated method stub
-
}
Modified: trunk/ggc-pump/build/build.xml
===================================================================
--- trunk/ggc-pump/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -5,6 +5,8 @@
</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="./GGCPumpToolVersion.properties"/>
@@ -69,6 +71,7 @@
<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>
Modified: trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -16,6 +16,7 @@
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.ATechDate;
+// TODO: Auto-generated Javadoc
/**
* Application: GGC - GNU Gluco Control
*
@@ -51,7 +52,15 @@
private static final long serialVersionUID = 4355479385042532802L;
private boolean selected = false;
+
+ /**
+ * The ic.
+ */
I18nControl ic = null; // (I18nControl)DataAccess.getInstance().getI18nControlInstance();
+
+ /**
+ * The backup_mode.
+ */
boolean backup_mode = false;
/**
@@ -528,12 +537,18 @@
+ /**
+ * Get Column Count
+ */
public int getColumnCount()
{
return 3;
}
+ /**
+ * Get Column Name
+ */
public String getColumnName(int num)
{
switch (num)
@@ -551,6 +566,9 @@
}
+ /**
+ * getColumnValue
+ */
public String getColumnValue(int num)
{
switch (num)
@@ -571,6 +589,9 @@
}
+ /**
+ * getColumnValueObject
+ */
public Object getColumnValueObject(int num)
{
switch (num)
@@ -591,6 +612,9 @@
}
+ /**
+ * getColumnWidth
+ */
public int getColumnWidth(int num, int width)
{
switch (num)
@@ -606,12 +630,18 @@
}
+ /**
+ * getItemId
+ */
public long getItemId()
{
return this.getId();
}
+ /**
+ * getShortDescription
+ */
public String getShortDescription()
{
// TODO Auto-generated method stub
@@ -619,18 +649,27 @@
}
+ /**
+ * isFound
+ */
public boolean isFound(String text)
{
return true;
}
+ /**
+ * isFound
+ */
public boolean isFound(int value)
{
return true;
}
+ /**
+ * isFound
+ */
public boolean isFound(int from, int till, int state)
{
switch(state)
@@ -651,6 +690,9 @@
+ /**
+ * setSearchContext
+ */
public void setSearchContext()
{
// TODO Auto-generated method stub
Modified: trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -5,18 +5,36 @@
import com.atech.i18n.I18nControlAbstract;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class AbstractPumpDeviceCompany.
+ */
public abstract class AbstractPumpDeviceCompany extends AbstractDeviceCompany
{
+ /**
+ * The profile_names
+ */
protected String[] profile_names;
+ /**
+ * Instantiates a new abstract pump device company
+ *
+ * @param ic the ic
+ * @param value the value
+ */
public AbstractPumpDeviceCompany(I18nControlAbstract ic, boolean value)
{
super(ic, value);
}
+ /**
+ * Gets the profile names
+ *
+ * @return the profile names
+ */
public String[] getProfileNames()
{
return this.profile_names;
Modified: trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -8,10 +8,49 @@
import ggc.plugin.protocol.ConnectionProtocols;
import ggc.pump.device.AbstractPump;
+// TODO: Auto-generated Javadoc
+/**
+ * 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: Generic Pump Device
+ * Description: Generic Pump Device used for getting profile names for specified
+ * pump company.
+ *
+ * Author: Andy {an...@at...}
+ */
+
+
+
public class GenericPumpDevice extends AbstractPump
{
+
+ /**
+ * The apdc.
+ */
AbstractPumpDeviceCompany apdc;
+ /**
+ * Instantiates a new generic pump device.
+ *
+ * @param apdc the apdc
+ */
public GenericPumpDevice(AbstractPumpDeviceCompany apdc)
{
this.apdc = apdc;
@@ -75,6 +114,9 @@
+ /**
+ * getProfileNames
+ */
public String[] getProfileNames()
{
return this.apdc.getProfileNames();
@@ -82,6 +124,9 @@
+ /**
+ * close
+ */
public void close() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -89,6 +134,9 @@
}
+ /**
+ * getAlarmMappings
+ */
public Hashtable<String, Integer> getAlarmMappings()
{
// TODO Auto-generated method stub
@@ -96,6 +144,9 @@
}
+ /**
+ * getBolusMappings
+ */
public Hashtable<String, Integer> getBolusMappings()
{
// TODO Auto-generated method stub
@@ -103,6 +154,9 @@
}
+ /**
+ * getDeviceInfo
+ */
public DeviceIdentification getDeviceInfo()
{
// TODO Auto-generated method stub
@@ -110,6 +164,9 @@
}
+ /**
+ * getErrorMappings
+ */
public Hashtable<String, Integer> getErrorMappings()
{
// TODO Auto-generated method stub
@@ -117,6 +174,9 @@
}
+ /**
+ * getEventMappings
+ */
public Hashtable<String, Integer> getEventMappings()
{
// TODO Auto-generated method stub
@@ -124,6 +184,9 @@
}
+ /**
+ * getMaxMemoryRecords
+ */
public int getMaxMemoryRecords()
{
// TODO Auto-generated method stub
@@ -131,6 +194,9 @@
}
+ /**
+ * getReportMappings
+ */
public Hashtable<String, Integer> getReportMappings()
{
// TODO Auto-generated method stub
@@ -138,6 +204,9 @@
}
+ /**
+ * loadPumpSpecificValues
+ */
public void loadPumpSpecificValues()
{
// TODO Auto-generated method stub
@@ -145,6 +214,9 @@
}
+ /**
+ * open
+ */
public boolean open() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -152,6 +224,9 @@
}
+ /**
+ * dispose
+ */
public void dispose()
{
// TODO Auto-generated method stub
@@ -159,6 +234,9 @@
}
+ /**
+ * getComment
+ */
public String getComment()
{
// TODO Auto-generated method stub
@@ -166,6 +244,9 @@
}
+ /**
+ * getDeviceClassName
+ */
public String getDeviceClassName()
{
// TODO Auto-generated method stub
@@ -173,6 +254,9 @@
}
+ /**
+ * getDeviceId
+ */
public int getDeviceId()
{
// TODO Auto-generated method stub
@@ -180,6 +264,9 @@
}
+ /**
+ * getDeviceSpecialComment
+ */
public String getDeviceSpecialComment()
{
// TODO Auto-generated method stub
@@ -187,6 +274,9 @@
}
+ /**
+ * getIconName
+ */
public String getIconName()
{
// TODO Auto-generated method stub
@@ -194,6 +284,9 @@
}
+ /**
+ * getImplementationStatus
+ */
public int getImplementationStatus()
{
// TODO Auto-generated method stub
@@ -201,6 +294,9 @@
}
+ /**
+ * getInstructions
+ */
public String getInstructions()
{
// TODO Auto-generated method stub
@@ -208,6 +304,9 @@
}
+ /**
+ * hasSpecialProgressStatus
+ */
public boolean hasSpecialProgressStatus()
{
// TODO Auto-generated method stub
@@ -215,6 +314,9 @@
}
+ /**
+ * isDeviceCommunicating
+ */
public boolean isDeviceCommunicating()
{
// TODO Auto-generated method stub
@@ -222,6 +324,9 @@
}
+ /**
+ * readConfiguration
+ */
public void readConfiguration() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -229,6 +334,9 @@
}
+ /**
+ * readDeviceDataFull
+ */
public void readDeviceDataFull() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -236,6 +344,9 @@
}
+ /**
+ * readDeviceDataPartitial
+ */
public void readDeviceDataPartitial() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -243,6 +354,9 @@
}
+ /**
+ * readInfo
+ */
public void readInfo() throws PlugInBaseException
{
// TODO Auto-generated method stub
Modified: trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -1,35 +1,5 @@
-/*
- * GGC - GNU Gluco Control
- *
- * A pure java app to help you manage your diabetes.
- *
- * 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: MeterManager.java
- * Purpose: This class contains all definitions for Meters. This includes:
- * meter names, classes that handle meter and all other relevant data.
- *
- * Author: andyrozman
- */
-
-
package ggc.pump.manager.company;
-import ggc.plugin.manager.company.AbstractDeviceCompany;
import ggc.pump.manager.PumpManager;
import ggc.pump.util.I18nControl;
Modified: trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -11,6 +11,7 @@
import com.atech.utils.TimeZoneUtil;
import com.atech.utils.TimerThread;
+// TODO: Auto-generated Javadoc
/**
* Application: GGC - GNU Gluco Control
* Plug-in: Pump Tool (support for Pump devices)
@@ -42,6 +43,9 @@
{
+ /**
+ * The thread.
+ */
TimerThread thread;
/**
@@ -126,10 +130,13 @@
}
+ /**
+ * Something.
+ */
public static void something()
{
- String input = "0-400=0.2";
- String[] ss = input.split("[-=]");
+ //String input = "0-400=0.2";
+ //String[] ss = input.split("[-=]");
Modified: trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -27,6 +27,7 @@
import com.atech.graphics.components.about.LibraryInfoEntry;
import com.atech.i18n.I18nControlAbstract;
+// TODO: Auto-generated Javadoc
/**
* Application: GGC - GNU Gluco Control
* Plug-in: Pump Tool (support for Pump devices)
@@ -67,16 +68,50 @@
private PumpManager m_pumpManager = null;
+ /**
+ * The m_pump_base_type.
+ */
PumpBaseType m_pump_base_type = null;
+
+ /**
+ * The m_pump_bolus_type.
+ */
PumpBolusType m_pump_bolus_type = null;
+
+ /**
+ * The m_pump_basal_type.
+ */
PumpBasalSubType m_pump_basal_type = null;
+
+ /**
+ * The m_pump_report.
+ */
PumpReport m_pump_report = null;
+
+ /**
+ * The m_pump_add_type.
+ */
PumpAdditionalDataType m_pump_add_type = null;
+
+ /**
+ * The m_pump_alarms.
+ */
PumpAlarms m_pump_alarms = null;
+
+ /**
+ * The m_pump_events.
+ */
PumpEvents m_pump_events = null;
+
+ /**
+ * The m_pump_errors.
+ */
PumpErrors m_pump_errors = null;
// GGCPumpDb m_db = null;
+ /**
+ * The selected_person_id.
+ */
long selected_person_id = 0;
// ********************************************************
@@ -510,7 +545,14 @@
// ****** Db *****
// ********************************************************
+ /**
+ * The m_db.
+ */
GGCPumpDb m_db;
+
+ /**
+ * The hdb.
+ */
HibernateDb hdb;
/**
@@ -641,6 +683,9 @@
}
+ /**
+ * Load PlugIns
+ */
@Override
public void loadPlugIns()
{
@@ -665,11 +710,21 @@
// configuration settings
+ /**
+ * Gets the max basal value.
+ *
+ * @return the max basal value
+ */
public float getMaxBasalValue()
{
return 8.0f;
}
+ /**
+ * Gets the basal step.
+ *
+ * @return the basal step
+ */
public float getBasalStep()
{
return 0.1f;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
