diff --git a/classRepresentation/methodGiws.py b/classRepresentation/methodGiws.py index fa146be..fa5d59d 100644 --- a/classRepresentation/methodGiws.py +++ b/classRepresentation/methodGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from parameterGiws import parameterGiws +from classRepresentation.parameterGiws import parameterGiws from JNIFrameWork import JNIFrameWork from datatypes.dataGiws import dataGiws from datatypes.stringDataGiws import stringDataGiws @@ -54,7 +54,7 @@ def __init__(self, name, returns, detachThread, modifier=None): if isinstance(returns, dataGiws): self.__returns = returns else: - raise Exception("The type must be a dataGiws object") + raise Exception("The return type must be a dataGiws object") self.__parameters = [] if detachThread: self.__detachThread = "\njvm_->DetachCurrentThread();\n" @@ -63,6 +63,8 @@ def __init__(self, name, returns, detachThread, modifier=None): def addParameter(self, parameter): if isinstance(parameter, parameterGiws): self.__parameters.append(parameter) + else: + raise Exception("The parameter type must be a parameterGiws object") def getName(self): return self.__name diff --git a/classRepresentation/objectGiws.py b/classRepresentation/objectGiws.py index 9778e55..f815ac1 100644 --- a/classRepresentation/objectGiws.py +++ b/classRepresentation/objectGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from methodGiws import methodGiws +from classRepresentation.methodGiws import methodGiws from JNIFrameWork import JNIFrameWork from datatypes.stringDataGiws import stringDataGiws from configGiws import configGiws @@ -59,6 +59,8 @@ def __init__(self, name, extends): def addMethod(self, method): if isinstance(method, methodGiws): self.__methods.append(method) + else: + raise Exception("The method must be a methodGiws object") def getName(self): return self.__name diff --git a/classRepresentation/packageGiws.py b/classRepresentation/packageGiws.py index 524548d..4573484 100644 --- a/classRepresentation/packageGiws.py +++ b/classRepresentation/packageGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from objectGiws import objectGiws +from classRepresentation.objectGiws import objectGiws class packageGiws: @@ -60,6 +60,9 @@ def getObjects(self): def addObject(self, object): if isinstance(object, objectGiws): self.__objects.append(object) + else: + raise Exception("cannot add a non GIWS object") + def getObject(self, name): for object in self.__objects: diff --git a/datatypes/ByteBufferDataGiws.py b/datatypes/ByteBufferDataGiws.py index cf18629..01f267e 100644 --- a/datatypes/ByteBufferDataGiws.py +++ b/datatypes/ByteBufferDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataBufferGiws import dataBufferGiws +from datatypes.dataBufferGiws import dataBufferGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/CharBufferDataGiws.py b/datatypes/CharBufferDataGiws.py index cca6de9..c738a17 100644 --- a/datatypes/CharBufferDataGiws.py +++ b/datatypes/CharBufferDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataBufferGiws import dataBufferGiws +from datatypes.dataBufferGiws import dataBufferGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/DoubleBufferDataGiws.py b/datatypes/DoubleBufferDataGiws.py index f9216a4..1da7e28 100644 --- a/datatypes/DoubleBufferDataGiws.py +++ b/datatypes/DoubleBufferDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataBufferGiws import dataBufferGiws +from datatypes.dataBufferGiws import dataBufferGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/FloatBufferDataGiws.py b/datatypes/FloatBufferDataGiws.py index 1ff9456..4a38de5 100644 --- a/datatypes/FloatBufferDataGiws.py +++ b/datatypes/FloatBufferDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataBufferGiws import dataBufferGiws +from datatypes.dataBufferGiws import dataBufferGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/IntBufferDataGiws.py b/datatypes/IntBufferDataGiws.py index f35d904..3b4c9bc 100644 --- a/datatypes/IntBufferDataGiws.py +++ b/datatypes/IntBufferDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataBufferGiws import dataBufferGiws +from datatypes.dataBufferGiws import dataBufferGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/LongBufferDataGiws.py b/datatypes/LongBufferDataGiws.py index 8ed90b6..fb730f6 100644 --- a/datatypes/LongBufferDataGiws.py +++ b/datatypes/LongBufferDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataBufferGiws import dataBufferGiws +from datatypes.dataBufferGiws import dataBufferGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/ShortBufferDataGiws.py b/datatypes/ShortBufferDataGiws.py index 0590e25..b307acd 100644 --- a/datatypes/ShortBufferDataGiws.py +++ b/datatypes/ShortBufferDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataBufferGiws import dataBufferGiws +from datatypes.dataBufferGiws import dataBufferGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/booleanDataGiws.py b/datatypes/booleanDataGiws.py index 7b25524..ad5719e 100644 --- a/datatypes/booleanDataGiws.py +++ b/datatypes/booleanDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws from JNIFrameWork import JNIFrameWork from configGiws import configGiws diff --git a/datatypes/byteDataGiws.py b/datatypes/byteDataGiws.py index b132571..c55a40c 100644 --- a/datatypes/byteDataGiws.py +++ b/datatypes/byteDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws class byteDataGiws(dataGiws): diff --git a/datatypes/charDataGiws.py b/datatypes/charDataGiws.py index d81770d..4f3ac9d 100644 --- a/datatypes/charDataGiws.py +++ b/datatypes/charDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws class charDataGiws(dataGiws): diff --git a/datatypes/dataBufferGiws.py b/datatypes/dataBufferGiws.py index f6a48ac..00dc9b8 100644 --- a/datatypes/dataBufferGiws.py +++ b/datatypes/dataBufferGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/dataFactoryGiws.py b/datatypes/dataFactoryGiws.py index de1342a..81575ac 100644 --- a/datatypes/dataFactoryGiws.py +++ b/datatypes/dataFactoryGiws.py @@ -52,7 +52,6 @@ from datatypes.IntBufferDataGiws import IntBufferDataGiws from datatypes.ShortBufferDataGiws import ShortBufferDataGiws import datatypes -import new """ Factory which create the different data types """ diff --git a/datatypes/doubleDataGiws.py b/datatypes/doubleDataGiws.py index 5030da8..0a2e26d 100644 --- a/datatypes/doubleDataGiws.py +++ b/datatypes/doubleDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws class doubleDataGiws(dataGiws): diff --git a/datatypes/floatDataGiws.py b/datatypes/floatDataGiws.py index 59f48ae..6c6f277 100644 --- a/datatypes/floatDataGiws.py +++ b/datatypes/floatDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws class floatDataGiws(dataGiws): diff --git a/datatypes/intDataGiws.py b/datatypes/intDataGiws.py index ab81e1a..8f3078c 100644 --- a/datatypes/intDataGiws.py +++ b/datatypes/intDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws class intDataGiws(dataGiws): diff --git a/datatypes/longDataGiws.py b/datatypes/longDataGiws.py index 5ecf15b..e7ce733 100644 --- a/datatypes/longDataGiws.py +++ b/datatypes/longDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws class longDataGiws(dataGiws): diff --git a/datatypes/shortDataGiws.py b/datatypes/shortDataGiws.py index 4d7d5ae..94d47b7 100644 --- a/datatypes/shortDataGiws.py +++ b/datatypes/shortDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws class shortDataGiws(dataGiws): diff --git a/datatypes/stringDataGiws.py b/datatypes/stringDataGiws.py index 011e1a5..6ea5109 100644 --- a/datatypes/stringDataGiws.py +++ b/datatypes/stringDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws from configGiws import configGiws from JNIFrameWork import JNIFrameWork diff --git a/datatypes/voidDataGiws.py b/datatypes/voidDataGiws.py index 8e272cd..0b54b2b 100644 --- a/datatypes/voidDataGiws.py +++ b/datatypes/voidDataGiws.py @@ -34,7 +34,7 @@ # # For more information, see the file COPYING -from dataGiws import dataGiws +from datatypes.dataGiws import dataGiws class voidDataGiws(dataGiws): diff --git a/giws b/giws index 6a036c6..ad6c995 100755 --- a/giws +++ b/giws @@ -49,7 +49,7 @@ class giws: templateObj = None def __init__(self, argv=sys.argv): self.argv = argv - self.config.setFullCommandLine(argv[1:]) + self.config.setFullCommandLine(argv[1:]) try: self.__parse_cmdline()