From ed316161acbb22f346a45f0a8924e6fedced58fd Mon Sep 17 00:00:00 2001
From: danikov <dan.lobianco@cloudsoftcorp.com>
Date: Mon, 13 Feb 2012 12:05:54 +0000
Subject: [PATCH] rebase OrgNetwork off abstract type

---
 .../director/v1_5/domain/OrgNetwork.java      | 48 +++++++------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgNetwork.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgNetwork.java
index f2e72fac77..3e56987900 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgNetwork.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgNetwork.java
@@ -18,9 +18,9 @@
  */
 package org.jclouds.vcloud.director.v1_5.domain;
 
-import static com.google.common.base.Objects.*;
-import static com.google.common.base.Preconditions.*;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.*;
+import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
 
 import java.net.URI;
 import java.util.Set;
@@ -33,7 +33,7 @@ import com.google.common.base.Objects.ToStringHelper;
 import com.google.common.collect.Sets;
 
 @XmlRootElement(namespace = VCLOUD_1_5_NS, name = "OrgNetwork")
-public class OrgNetwork extends EntityType<OrgNetwork> {
+public class OrgNetwork extends NetworkType<OrgNetwork> {
    
    @SuppressWarnings("unchecked")
    public static Builder builder() {
@@ -45,20 +45,11 @@ public class OrgNetwork extends EntityType<OrgNetwork> {
       return new Builder().fromOrgNetwork(this);
    }
 
-   public static class Builder extends EntityType.Builder<OrgNetwork> {
+   public static class Builder extends NetworkType.Builder<OrgNetwork> {
 
-      private NetworkConfiguration networkConfiguration;
       private ReferenceType<?> networkPool;
       private IpAddresses allowedExternalIpAddresses;
       
-      /**
-       * @see OrgNetwork#getConfiguration()
-       */
-      public Builder configuration(NetworkConfiguration networkConfiguration) {
-         this.networkConfiguration = networkConfiguration;
-         return this;
-      }
-      
       /**
        * @see OrgNetwork#getNetworkPool()
        */
@@ -88,6 +79,14 @@ public class OrgNetwork extends EntityType<OrgNetwork> {
          network.setTasksInProgress(tasksInProgress);
          return network;
       }
+      
+      /**
+       * @see NetworkType#getConfiguration()
+       */
+      public Builder configuration(NetworkConfiguration networkConfiguration) {
+         this.networkConfiguration = networkConfiguration;
+         return this;
+      }
 
       /**
        * @see EntityType#getName()
@@ -181,24 +180,11 @@ public class OrgNetwork extends EntityType<OrgNetwork> {
       super(href, name);
    }
 
-   @XmlElement(namespace = VCLOUD_1_5_NS, name = "Configuration")
-   private NetworkConfiguration networkConfiguration;
    @XmlElement(namespace = VCLOUD_1_5_NS, name = "NetworkPool")
    private ReferenceType<?> networkPool;
    @XmlElement(namespace = VCLOUD_1_5_NS, name = "AllowedExternalIpAddresses")
    private IpAddresses allowedExternalIpAddresses;
 
-   /**
-    * @return optional configuration
-    */
-   public NetworkConfiguration getConfiguration() {
-      return networkConfiguration;
-   }
-   
-   public void setConfiguration(NetworkConfiguration networkConfiguration) {
-      this.networkConfiguration = networkConfiguration;
-   }
-   
    /**
     * @return optional network pool
     */
@@ -226,20 +212,18 @@ public class OrgNetwork extends EntityType<OrgNetwork> {
       if (!super.equals(o))
          return false;
       OrgNetwork that = OrgNetwork.class.cast(o);
-      return super.equals(that) && equal(networkConfiguration, that.networkConfiguration) &&
-            equal(networkPool, that.networkPool) && 
+      return super.equals(that) && equal(networkPool, that.networkPool) && 
             equal(allowedExternalIpAddresses, that.allowedExternalIpAddresses);
    }
 
    @Override
    public int hashCode() {
-      return super.hashCode() + Objects.hashCode(networkConfiguration, 
-            networkPool, allowedExternalIpAddresses);
+      return super.hashCode() + Objects.hashCode(networkPool, allowedExternalIpAddresses);
    }
 
    @Override
    public ToStringHelper string() {
-      return super.string().add("configuration", networkConfiguration).add("networkPool", networkPool)
+      return super.string().add("networkPool", networkPool)
             .add("allowedExternalIpAddresses", allowedExternalIpAddresses);
    }