Refactor.

[yaz4j-moved-to-github.git] / src / main / java / org / yaz4j / ConnectionExtended.java

diff --git a/src/main/java/org/yaz4j/ConnectionExtended.java b/src/main/java/org/yaz4j/ConnectionExtended.java
index 8d9744b..095d9ce 100644 (file)
--- a/src/main/java/org/yaz4j/ConnectionExtended.java
+++ b/src/main/java/org/yaz4j/ConnectionExtended.java
@@ -4,21 +4,17 @@ import org.yaz4j.jni.SWIGTYPE_p_ZOOM_options_p;
 import org.yaz4j.jni.SWIGTYPE_p_ZOOM_package_p;
 import org.yaz4j.jni.yaz4jlib;
 
-public class ConnectionExtended extends Connection
-{
-    public ConnectionExtended(String host, int port) 
-       {
-       super(host, port);
-       }
+public class ConnectionExtended extends Connection {
 
-    public Package Package(String type)
-    {
-        EnsureConnected();
+    public ConnectionExtended(String host, int port) {
+        super(host, port);
+    }
+
+    public Package getPackage(String type) {
+      if (closed) throw new IllegalStateException("Connection is closed.");
         Package pack = null;
-        
         SWIGTYPE_p_ZOOM_options_p options = yaz4jlib.ZOOM_options_create();
-
-        SWIGTYPE_p_ZOOM_package_p yazPackage = yaz4jlib.ZOOM_connection_package( zoomConnection, options);
+        SWIGTYPE_p_ZOOM_package_p yazPackage = yaz4jlib.ZOOM_connection_package(zoomConnection, options);
         pack = new Package(yazPackage, this, type);
         return pack;
     }