phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject [05/36] git commit: Add missing @Override tag
Date Mon, 10 Mar 2014 04:21:36 GMT
Add missing @Override tag


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/511a5cdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/511a5cdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/511a5cdd

Branch: refs/heads/4.0
Commit: 511a5cddbe5a509f2188e205a71a68a29e8ac71e
Parents: 590b912
Author: James Taylor <jamestaylor@apache.org>
Authored: Wed Mar 5 16:42:17 2014 -0800
Committer: James Taylor <jamestaylor@apache.org>
Committed: Wed Mar 5 16:42:17 2014 -0800

----------------------------------------------------------------------
 .../org/apache/phoenix/util/ColumnInfo.java     | 57 +++++++++-----------
 1 file changed, 25 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/511a5cdd/phoenix-core/src/main/java/org/apache/phoenix/util/ColumnInfo.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ColumnInfo.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ColumnInfo.java
index 9a41b91..37238c8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ColumnInfo.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ColumnInfo.java
@@ -1,19 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements. See the NOTICE
+ * file distributed with this work for additional information regarding copyright ownership.
The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not use this file
except in compliance with the
+ * License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by
+ * applicable law or agreed to in writing, software distributed under the License is distributed
on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
for the specific language
+ * governing permissions and limitations under the License.
  */
 
 package org.apache.phoenix.util;
@@ -24,23 +16,24 @@ import org.apache.phoenix.schema.PDataType;
  * ColumnInfo used to store Column Name and its associated PDataType
  */
 public class ColumnInfo {
-	private String columnName;
-	private Integer sqlType;
+    private String columnName;
+    private Integer sqlType;
 
-	public ColumnInfo(String columnName, Integer sqlType) {
-		this.columnName = columnName;
-		this.sqlType = sqlType;
-	}
+    public ColumnInfo(String columnName, Integer sqlType) {
+        this.columnName = columnName;
+        this.sqlType = sqlType;
+    }
 
-	public String getColumnName() {
-		return columnName;
-	}
+    public String getColumnName() {
+        return columnName;
+    }
 
-	public Integer getSqlType() {
-		return sqlType;
-	}
-	
-	public String toString() {
-		return columnName+" "+PDataType.fromTypeId(sqlType).getSqlTypeName();
-	}
-}	
+    public Integer getSqlType() {
+        return sqlType;
+    }
+
+    @Override
+    public String toString() {
+        return columnName + " " + PDataType.fromTypeId(sqlType).getSqlTypeName();
+    }
+}


Mime
View raw message