Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[1446] trunk
|
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.
|
