From 7a0cf30d95055895eee24fe9e2ea5082a6016cad Mon Sep 17 00:00:00 2001
From: sridharv <sridhar@laddoo.net>
Date: Mon, 28 Mar 2016 17:23:28 +0200
Subject: [PATCH] Gofmt

---
 gojava.go      | 18 +++++++++---------
 gojava_test.go | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gojava.go b/gojava.go
index 520f5b5..bea7226 100644
--- a/gojava.go
+++ b/gojava.go
@@ -18,8 +18,8 @@ import (
 	"archive/zip"
 	"runtime"
 
-	"github.com/sridharv/gomobile-java/bind"
 	"flag"
+	"github.com/sridharv/gomobile-java/bind"
 )
 
 func runCommand(cmd string, args ...string) error {
@@ -32,7 +32,7 @@ func runCommand(cmd string, args ...string) error {
 var javaHome = os.Getenv("JAVA_HOME")
 var cwd string
 
-func initBuild() (string, func (), error) {
+func initBuild() (string, func(), error) {
 	if javaHome == "" {
 		return "", nil, fmt.Errorf("$JAVA_HOME not set")
 	}
@@ -44,7 +44,7 @@ func initBuild() (string, func (), error) {
 	if err != nil {
 		return "", nil, err
 	}
-	return tmpDir, func () {
+	return tmpDir, func() {
 		os.RemoveAll(tmpDir)
 		os.Chdir(cwd)
 	}, nil
@@ -81,8 +81,8 @@ func createDirs(dirs ...string) error {
 func bindPackages(bindDir, javaDir string, pkgs []*types.Package) ([]string, error) {
 	fs, javaFiles := token.NewFileSet(), make([]string, 0)
 	for _, p := range pkgs {
-		goFile := filepath.Join(bindDir, "go_" + p.Name() + "main.go")
-		f, err := os.OpenFile(goFile, os.O_CREATE | os.O_RDWR, 0600)
+		goFile := filepath.Join(bindDir, "go_"+p.Name()+"main.go")
+		f, err := os.OpenFile(goFile, os.O_CREATE|os.O_RDWR, 0600)
 		if err != nil {
 			return nil, fmt.Errorf("failed to open: %s: %v", goFile, err)
 		}
@@ -97,10 +97,10 @@ func bindPackages(bindDir, javaDir string, pkgs []*types.Package) ([]string, err
 		if err := bindJava(javaDir, javaFile, conf, int(bind.Java)); err != nil {
 			return nil, err
 		}
-		if err := bindJava(bindDir, "java_" + p.Name() + ".c", conf, int(bind.JavaC)); err != nil {
+		if err := bindJava(bindDir, "java_"+p.Name()+".c", conf, int(bind.JavaC)); err != nil {
 			return nil, err
 		}
-		if err := bindJava(bindDir, p.Name() + ".h", conf, int(bind.JavaH)); err != nil {
+		if err := bindJava(bindDir, p.Name()+".h", conf, int(bind.JavaH)); err != nil {
 			return nil, err
 		}
 		javaFiles = append(javaFiles, filepath.Join(javaDir, javaFile))
@@ -314,7 +314,7 @@ This generates a jar containing Java bindings to the specified Go packages.
 
 func main() {
 	o := flag.String("o", "libgojava.jar", "Path to the generated jar file")
-	flag.Usage = func () {
+	flag.Usage = func() {
 		fmt.Fprintln(os.Stderr, usage)
 		flag.PrintDefaults()
 	}
@@ -327,4 +327,4 @@ func main() {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
-}
\ No newline at end of file
+}
diff --git a/gojava_test.go b/gojava_test.go
index b408b63..8559206 100644
--- a/gojava_test.go
+++ b/gojava_test.go
@@ -3,11 +3,11 @@ package main
 import (
 	"testing"
 
-	"io/ioutil"
-	"path/filepath"
-	"os/exec"
-	"os"
 	"flag"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
 )
 
 var javaTest = flag.String("javatest", ".*", "Run only java tests matching the regular expression")
@@ -36,7 +36,7 @@ func TestJavaBind(t *testing.T) {
 	if err := runCommand("javac", "-cp", jar, "-d", tmpDir, toCopy[0].dst, toCopy[1].dst); err != nil {
 		t.Fatal(err)
 	}
-	cmd := exec.Command("java", "-cp", jar + ":" + tmpDir, "go.MoreAsserts", *javaTest)
+	cmd := exec.Command("java", "-cp", jar+":"+tmpDir, "go.MoreAsserts", *javaTest)
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
 	if err := cmd.Run(); err != nil {