Return-Path: 
 <commits-return-34989-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B45B81010F
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu, 21 Nov 2013 16:12:33 +0000 (UTC)
Received: (qmail 3024 invoked by uid 500); 21 Nov 2013 16:11:01 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 1959 invoked by uid 500); 21 Nov 2013 16:10:17 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 1626 invoked by uid 99); 21 Nov 2013 16:10:05 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Nov 2013 16:10:05 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 4518589B3A4; Thu, 21 Nov 2013 16:10:05 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ahuang@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 21 Nov 2013 16:10:05 -0000
Message-Id: <3a74aa5f9b5f463a93af446726dc06f1@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [01/58] [abbrv] [partial] Reformatted all of the code.

Updated Branches:
  refs/heads/master 3a414a850 -> 433a63191


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
index 6ba546d..211280d 100644
--- a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
@@ -20,6 +20,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
+
 import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
@@ -29,8 +30,8 @@ import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 @Component
@@ -54,17 +55,20 @@ public class PortProfileDaoImpl extends GenericDaoBase<PortProfileVO, Long> impl
         accessVlanSearch.done();
     }
 
+    @Override
     public PortProfileVO findByName(String portProfileName) {
         SearchCriteria<PortProfileVO> sc = nameSearch.create();
         sc.setParameters("portProfileName", portProfileName);
         return findOneBy(sc);
     }
 
+    @Override
     @DB
     public boolean doesVlanRangeClash(int lowVlanId, int highVlanId) {
         String dbName = "cloud";
         String tableName = "port_profile";
-        String condition = "(trunk_low_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")" + " OR (trunk_high_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")";
+        String condition =
+            "(trunk_low_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")" + " OR (trunk_high_vlan_id BETWEEN " + lowVlanId + " AND " + highVlanId + ")";
         String selectSql = "SELECT * FROM `" + dbName + "`.`" + tableName + "` WHERE " + condition;
 
         TransactionLegacy txn = TransactionLegacy.currentTxn();
@@ -81,6 +85,7 @@ public class PortProfileDaoImpl extends GenericDaoBase<PortProfileVO, Long> impl
         return false;
     }
 
+    @Override
     public List<PortProfileVO> listByVlanId(int vlanId) {
         SearchCriteria<PortProfileVO> sc = accessVlanSearch.create();
         sc.setParameters("accessVlanId", vlanId);