Hard Tabs++
Eliminate more hard tabs, widen scope of checkstyle rules to prevent regressions.
Relax whitespace expectations in polygon ctor
Change-Id: Ia3f78fc6705bc79a21cfa97fdfcad30998ab1058
Reviewed-on: https://asterix-gerrit.ics.uci.edu/967
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <tillw@apache.org>
diff --git a/hyracks-fullstack/algebricks/algebricks-tests/src/main/scripts/run.sh b/hyracks-fullstack/algebricks/algebricks-tests/src/main/scripts/run.sh
index 5ef4152..e54cfa1 100644
--- a/hyracks-fullstack/algebricks/algebricks-tests/src/main/scripts/run.sh
+++ b/hyracks-fullstack/algebricks/algebricks-tests/src/main/scripts/run.sh
@@ -85,7 +85,7 @@
# Try to find directory where this script is located
COMMAND="${PWD}/$0"
if [ ! -f "${COMMAND}" ]; then
- COMMAND="$0"
+ COMMAND="$0"
fi
BASEDIR=`expr "${COMMAND}" : '\(.*\)/\.*'`
diff --git a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/getip.sh b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/getip.sh
index eb7a2b9..e91fe0a 100755
--- a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/getip.sh
+++ b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/getip.sh
@@ -24,17 +24,17 @@
then
#Get IP Address
IPADDR=`/sbin/ifconfig eth0 | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'`
- if [ "$IPADDR" = "" ]
+ if [ "$IPADDR" = "" ]
then
- IPADDR=`/sbin/ifconfig em1 | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'`
- fi
- if [ "$IPADDR" = "" ]
+ IPADDR=`/sbin/ifconfig em1 | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'`
+ fi
+ if [ "$IPADDR" = "" ]
then
- IPADDR=`/sbin/ifconfig lo | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'`
- fi
+ IPADDR=`/sbin/ifconfig lo | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'`
+ fi
else
IPADDR=`/sbin/ifconfig en1 | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'`
- if [ "$IPADDR" = "" ]
+ if [ "$IPADDR" = "" ]
then
IPADDR=`/sbin/ifconfig lo0 | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'`
fi
diff --git a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/startDebugNc.sh b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/startDebugNc.sh
index 889f0ea..4d2fc51 100755
--- a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/startDebugNc.sh
+++ b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/startDebugNc.sh
@@ -41,8 +41,8 @@
io_dirs=$(echo $IO_DIRS2 | tr "," "\n")
for io_dir in $io_dirs
do
- rm -rf $io_dir
- mkdir $io_dir
+ rm -rf $io_dir
+ mkdir $io_dir
done
#Set JAVA_HOME
diff --git a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/startnc.sh b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/startnc.sh
index 3f3e438..d09b9c1 100755
--- a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/startnc.sh
+++ b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/startnc.sh
@@ -41,8 +41,8 @@
io_dirs=$(echo $IO_DIRS | tr "," "\n")
for io_dir in $io_dirs
do
- rm -rf $io_dir
- mkdir $io_dir
+ rm -rf $io_dir
+ mkdir $io_dir
done
#Set JAVA_HOME
diff --git a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/stopnc.sh b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/stopnc.sh
index 6ecfec1..099275b 100755
--- a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/stopnc.sh
+++ b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/bin/stopnc.sh
@@ -38,7 +38,7 @@
io_dirs=$(echo $IO_DIRS | tr "," "\n")
for io_dir in $io_dirs
do
- rm -rf $io_dir/*
+ rm -rf $io_dir/*
done
#Clean up NC temp dir
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
index aa91b83..c191ea5 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
@@ -7,7 +7,7 @@
! "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
+ ! 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
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 32313fb..7fd34b5 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -303,6 +303,8 @@
<module name="FileTabCharacter"/>
</module>
</checkstyleRules>
+ <includes>**/*.java,**/*.jj</includes>
+ <resourceIncludes>**/*.properties,**/*.xml,**/*.xsd,**/*.sh</resourceIncludes>
<sourceDirectories>${project.build.sourceDirectory},${project.build.testSourceDirectory}</sourceDirectories>
</configuration>
</plugin>