Changeset 348:d91f6bd7d381 for kraken-dom/src/main/java/org/krakenapps/dom/api/impl/NetworkAddressApiImpl.java

Timestamp:

09/20/11 03:16:11 (8 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2782

Message:

modified API interfaces.

File:

• kraken-dom/src/main/java/org/krakenapps/dom/api/impl/NetworkAddressApiImpl.java (modified) (6 diffs)

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/NetworkAddressApiImpl.java

@@ -25 +25 @@
 import org.apache.felix.ipojo.annotations.Provides;
 import org.apache.felix.ipojo.annotations.Requires;
+import org.krakenapps.dom.api.AbstractApi;
 import org.krakenapps.dom.api.NetworkAddressApi;
 import org.krakenapps.dom.api.OrganizationApi;
@@ -36 +37 @@
 @Provides
 @JpaConfig(factory = "dom")
-public class NetworkAddressApiImpl implements NetworkAddressApi {
-
+public class NetworkAddressApiImpl extends AbstractApi<NetworkAddress> implements NetworkAddressApi {
         @Requires
         private ThreadLocalEntityManagerService entityManagerService;
@@ -65 +65 @@
         }
 
-        @Transactional
         @Override
         public NetworkAddress createNetworkAddress(int organizationId, String name, int type, String address1,
+                        String address2) {
+                NetworkAddress addr = createNetworkAddressInternal(organizationId, name, type, address1, address2);
+                fireEntityAdded(addr);
+                return addr;
+        }
+
+        @Transactional
+        private NetworkAddress createNetworkAddressInternal(int organizationId, String name, int type, String address1,
                         String address2) {
                 EntityManager em = entityManagerService.getEntityManager();
@@ -88 +95 @@
         }
 
+        @Override
+        public NetworkAddress updateNetworkAddress(int organizationId, int id, String name, int type, String address1,
+                        String address2) {
+                NetworkAddress addr = updateNetworkAddressInternal(organizationId, id, name, type, address1, address2);
+                fireEntityUpdated(addr);
+                return addr;
+        }
+
         @Transactional
-        @Override
-        public void updateNetworkAddress(int organizationId, int id, String name, int type, String address1, String address2) {
+        private NetworkAddress updateNetworkAddressInternal(int organizationId, int id, String name, int type,
+                        String address1, String address2) {
                 EntityManager em = entityManagerService.getEntityManager();
 
@@ -104 +119 @@
 
                 em.merge(addr);
+                return addr;
+        }
+
+        @Override
+        public NetworkAddress removeNetworkAddress(int organizationId, int id) {
+                NetworkAddress addr = removeNetworkAddressInternal(organizationId, id);
+                fireEntityRemoved(addr);
+                return addr;
         }
 
         @Transactional
-        @Override
-        public void removeNetworkAddress(int organizationId, int id) {
+        private NetworkAddress removeNetworkAddressInternal(int organizationId, int id) {
                 EntityManager em = entityManagerService.getEntityManager();
 
@@ -116 +138 @@
 
                 em.remove(addr);
+                return addr;
         }
 }