Menu
▾
▴
[ggc-cvs] SF.net SVN: ggc:[550] trunk/ggc-meter/src/ggc/meter/device
|
From: <and...@us...> - 2008-10-04 17:26:54
|
Revision: 550
http://ggc.svn.sourceforge.net/ggc/?rev=550&view=rev
Author: andyrozman
Date: 2008-10-04 17:26:44 +0000 (Sat, 04 Oct 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc-meter/src/ggc/meter/device/AbstractMeter.java
trunk/ggc-meter/src/ggc/meter/device/AbstractOtherMeter.java
trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java
trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
trunk/ggc-meter/src/ggc/meter/device/MeterInterface.java
trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekSmartPix.java
trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java
trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java
Removed Paths:
-------------
trunk/ggc-meter/src/ggc/meter/device/MeterException.java
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractMeter.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractMeter.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -10,6 +10,7 @@
import ggc.meter.data.MeterValuesEntry;
import ggc.meter.util.I18nControl;
+import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.manager.company.AbstractDeviceCompany;
import java.util.ArrayList;
@@ -184,7 +185,7 @@
- public void readDeviceData() throws MeterException
+ public void readDeviceData() throws PlugInBaseException
{
}
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractOtherMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractOtherMeter.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractOtherMeter.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -11,6 +11,7 @@
import ggc.meter.util.DataAccessMeter;
import ggc.meter.util.I18nControl;
import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.manager.company.AbstractDeviceCompany;
import ggc.plugin.output.OutputWriter;
@@ -203,7 +204,7 @@
- public void readDeviceData() throws MeterException
+ public void readDeviceData() throws PlugInBaseException
{
}
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractSerialMeter.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -859,7 +859,7 @@
- public void readDeviceData() throws MeterException
+ public void readDeviceData() throws PlugInBaseException
{
}
Modified: trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/AbstractXmlMeter.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -5,6 +5,7 @@
import ggc.meter.util.DataAccessMeter;
import ggc.meter.util.I18nControl;
import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.manager.company.AbstractDeviceCompany;
import ggc.plugin.output.OutputWriter;
import ggc.plugin.protocol.XmlProtocol;
@@ -39,7 +40,7 @@
boolean can_read_device_configuration = false;
- public void close() throws MeterException
+ public void close() throws PlugInBaseException
{
}
@@ -198,7 +199,7 @@
- public void readDeviceData() throws MeterException
+ public void readDeviceData() throws PlugInBaseException
{
}
Modified: trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/DummyMeter.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -13,6 +13,7 @@
import ggc.meter.data.MeterValuesEntry;
import ggc.meter.util.DataAccessMeter;
import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.protocol.ConnectionProtocols;
import java.util.ArrayList;
@@ -36,7 +37,7 @@
* This is method for reading data from device. All reading from actual device should be done from here.
* Reading can be done directly here, or event can be used to read data.
*/
- public void readDeviceDataFull() throws MeterException
+ public void readDeviceDataFull() throws PlugInBaseException
{
}
@@ -343,7 +344,7 @@
/**
* clearDeviceData - Clear data from device
*/
- public void clearDeviceData() throws MeterException
+ public void clearDeviceData() throws PlugInBaseException
{
}
@@ -360,7 +361,7 @@
* getDeviceConfiguration - return device configuration
* @return
*/
- public ArrayList<String> getDeviceConfiguration() throws MeterException
+ public ArrayList<String> getDeviceConfiguration() throws PlugInBaseException
{
return null;
}
@@ -409,7 +410,7 @@
* This is method for reading partitial data from device. All reading from actual device should be done from
* here. Reading can be done directly here, or event can be used to read data.
*/
- public void readDeviceDataPartitial() throws MeterException
+ public void readDeviceDataPartitial() throws PlugInBaseException
{
}
@@ -420,7 +421,7 @@
*
* @throws MeterExceptions
*/
- public void readConfiguration() throws MeterException
+ public void readConfiguration() throws PlugInBaseException
{
}
@@ -430,7 +431,7 @@
* information (most dumps do).
* @throws MeterExceptions
*/
- public void readInfo() throws MeterException
+ public void readInfo() throws PlugInBaseException
{
}
Deleted: trunk/ggc-meter/src/ggc/meter/device/MeterException.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/MeterException.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/MeterException.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -1,47 +0,0 @@
-package ggc.meter.device;
-
-import ggc.plugin.device.PlugInBaseException;
-
-
-public class MeterException extends PlugInBaseException
-{
-
- private static final long serialVersionUID = 5981328555320689970L;
-
- /**
- * Constructor for MeterException.
- */
- public MeterException()
- {
- super();
- }
-
- /**
- * Constructor for MeterException.
- * @param message
- */
- public MeterException(String message)
- {
- super(message);
- }
-
- /**
- * Constructor for MeterException.
- * @param message
- * @param cause
- */
- public MeterException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- /**
- * Constructor for MeterException.
- * @param cause
- */
- public MeterException(Throwable cause)
- {
- super(cause);
- }
-
-}
Modified: trunk/ggc-meter/src/ggc/meter/device/MeterInterface.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/MeterInterface.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/MeterInterface.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -2,6 +2,7 @@
import ggc.plugin.device.DeviceIdentification;
import ggc.plugin.device.DeviceInterface;
+import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.manager.company.AbstractDeviceCompany;
import com.atech.graphics.dialogs.selector.SelectableInterface;
@@ -51,7 +52,7 @@
/**
* Will be called, when the import is ended and freeing resources.
*/
- void close() throws MeterException;
+ void close() throws PlugInBaseException;
Modified: trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekSmartPix.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekSmartPix.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/accuchek/AccuChekSmartPix.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -2,8 +2,8 @@
package ggc.meter.device.accuchek;
import ggc.meter.device.AbstractXmlMeter;
-import ggc.meter.device.MeterException;
import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.manager.DeviceImplementationStatus;
import ggc.plugin.output.OutputWriter;
import ggc.plugin.protocol.ConnectionProtocols;
@@ -145,7 +145,7 @@
/*
* readDeviceDataFull
*/
- public void readDeviceDataFull() throws MeterException
+ public void readDeviceDataFull() throws PlugInBaseException
{
// write preliminary device identification, based on class
DeviceIdentification di = this.output_writer.getDeviceIdentification();
@@ -328,7 +328,7 @@
* This is method for reading partitial data from device. All reading from actual device should be done from
* here. Reading can be done directly here, or event can be used to read data.
*/
- public void readDeviceDataPartitial() throws MeterException
+ public void readDeviceDataPartitial() throws PlugInBaseException
{
}
@@ -338,7 +338,7 @@
*
* @throws MeterExceptions
*/
- public void readConfiguration() throws MeterException
+ public void readConfiguration() throws PlugInBaseException
{
}
@@ -348,7 +348,7 @@
* information (most dumps do).
* @throws MeterExceptions
*/
- public void readInfo() throws MeterException
+ public void readInfo() throws PlugInBaseException
{
}
Modified: trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/ascensia/AscensiaMeter.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -3,10 +3,10 @@
import ggc.meter.data.MeterValuesEntry;
import ggc.meter.device.AbstractSerialMeter;
-import ggc.meter.device.MeterException;
import ggc.meter.util.DataAccessMeter;
import ggc.meter.util.I18nControl;
import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.output.AbstractOutputWriter;
import ggc.plugin.output.OutputUtil;
import ggc.plugin.output.OutputWriter;
@@ -180,7 +180,7 @@
- public void readDeviceDataFull() throws MeterException
+ public void readDeviceDataFull() throws PlugInBaseException
{
waitTime(2000);
@@ -649,7 +649,7 @@
* This is method for reading partitial data from device. All reading from actual device should be done from
* here. Reading can be done directly here, or event can be used to read data.
*/
- public void readDeviceDataPartitial() throws MeterException
+ public void readDeviceDataPartitial() throws PlugInBaseException
{
}
@@ -659,7 +659,7 @@
*
* @throws MeterExceptions
*/
- public void readConfiguration() throws MeterException
+ public void readConfiguration() throws PlugInBaseException
{
}
@@ -669,7 +669,7 @@
* information (most dumps do).
* @throws MeterExceptions
*/
- public void readInfo() throws MeterException
+ public void readInfo() throws PlugInBaseException
{
}
Modified: trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java 2008-10-04 14:02:11 UTC (rev 549)
+++ trunk/ggc-meter/src/ggc/meter/device/onetouch/OneTouchMeter.java 2008-10-04 17:26:44 UTC (rev 550)
@@ -2,7 +2,6 @@
import ggc.meter.data.MeterValuesEntry;
import ggc.meter.device.AbstractSerialMeter;
-import ggc.meter.device.MeterException;
import ggc.meter.util.DataAccessMeter;
import ggc.plugin.device.PlugInBaseException;
import ggc.plugin.output.OutputWriter;
@@ -170,7 +169,7 @@
* This is method for reading partitial data from device. All reading from actual device should be done from
* here. Reading can be done directly here, or event can be used to read data.
*/
- public void readDeviceDataPartitial() throws MeterException
+ public void readDeviceDataPartitial() throws PlugInBaseException
{
}
@@ -181,7 +180,7 @@
*
* @throws MeterExceptions
*/
- public void readConfiguration() throws MeterException
+ public void readConfiguration() throws PlugInBaseException
{
}
@@ -191,7 +190,7 @@
* information (most dumps do).
* @throws MeterExceptions
*/
- public void readInfo() throws MeterException
+ public void readInfo() throws PlugInBaseException
{
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|