Compatibility with java 6

(cherry picked from commit 0be9c40)

Author: zolotov

src/com/goide/inspections/GoVarDeclarationInspection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan
+ * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,8 @@ private static Pair<List<? extends GoCompositeElement>, List<GoExpression>> getP
     PsiElement assign = varDeclaration instanceof GoShortVarDeclaration ? ((GoShortVarDeclaration)varDeclaration).getVarAssign()
                                                                         : varDeclaration.getAssign();
     if (assign == null) {
-      return Pair.create(ContainerUtil.emptyList(), ContainerUtil.emptyList());
+      return Pair.create(ContainerUtil.emptyList(),
+                         ContainerUtil.emptyList());
     }
     if (varDeclaration instanceof GoRecvStatement || varDeclaration instanceof GoRangeClause) {
       List<GoCompositeElement> v = ContainerUtil.newArrayList();

src/com/goide/psi/GoFile.java

@@ -126,7 +126,7 @@ public Result<List<GoFunctionDeclaration>> compute() {
         List<GoFunctionDeclaration> functions = stub != null 
                                                 ? getChildrenByType(stub, GoTypes.FUNCTION_DECLARATION,
                                                                                  GoFunctionDeclarationStubElementType.ARRAY_FACTORY)
-                                                : calc(
+                                                : GoFile.this.calc(
                                                                Conditions.instanceOf(GoFunctionDeclaration.class));
         return Result.create(functions, GoFile.this);
       }
@@ -141,7 +141,7 @@ public Result<List<GoMethodDeclaration>> compute() {
         StubElement<GoFile> stub = getStub();
         List<GoMethodDeclaration> calc = stub != null
                                          ? getChildrenByType(stub, GoTypes.METHOD_DECLARATION, GoMethodDeclarationStubElementType.ARRAY_FACTORY)
-                                         : calc(Conditions.instanceOf(GoMethodDeclaration.class));
+                                         : GoFile.this.calc(Conditions.instanceOf(GoMethodDeclaration.class));
         return Result.create(calc, GoFile.this);
       }
     });

src/com/goide/psi/impl/GoPsiImplUtil.java

@@ -1361,7 +1361,7 @@ private static GoExpression getLastExpressionAfter(@NotNull List<GoExpression> l
   }
 
   @NotNull
-  private static List<GoExpression> getExpressionsBefore(@NotNull List<GoExpression> list, @Nullable PsiElement anchor) {
+  private static List<GoExpression> getExpressionsBefore(@NotNull List<GoExpression> list, @Nullable final PsiElement anchor) {
     if (anchor == null) {
       return list;
     }

src/com/goide/runconfig/GoRunningState.java

@@ -26,6 +26,7 @@
 import com.intellij.execution.process.ProcessOutputTypes;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
@@ -51,13 +52,13 @@ public GoRunningState(@NotNull ExecutionEnvironment env, @NotNull Module module,
   @Override
   protected ProcessHandler startProcess() throws ExecutionException {
     GoExecutor executor = patchExecutor(createCommonExecutor());
-    GeneralCommandLine commandLine = executor.withParameterString(myConfiguration.getParams()).createCommandLine();
+    final GeneralCommandLine commandLine = executor.withParameterString(myConfiguration.getParams()).createCommandLine();
     return new KillableColoredProcessHandler(commandLine) {
       @Override
       public void startNotify() {
         Map<String, String> environment = commandLine.getEnvironment();
-        notifyTextAvailable("GOROOT=" + environment.getOrDefault(GoConstants.GO_ROOT, "") + '\n', ProcessOutputTypes.SYSTEM);
-        notifyTextAvailable("GOPATH=" + environment.getOrDefault(GoConstants.GO_PATH, "") + '\n', ProcessOutputTypes.SYSTEM);
+        notifyTextAvailable("GOROOT=" + StringUtil.nullize(environment.get(GoConstants.GO_ROOT)) + '\n', ProcessOutputTypes.SYSTEM);
+        notifyTextAvailable("GOPATH=" + StringUtil.nullize(environment.get(GoConstants.GO_PATH)) + '\n', ProcessOutputTypes.SYSTEM);
         super.startNotify();
       }
     };

src/com/goide/runconfig/testing/GoTestLocator.java

@@ -48,7 +48,7 @@ private GoTestLocator() {}
   @Override
   public List<Location> getLocation(@NotNull String protocolId,
                                     @NotNull String path,
-                                    @NotNull Project project,
+                                    @NotNull final Project project,
                                     @NotNull GlobalSearchScope scope) {
     if (PROTOCOL.equals(protocolId)) {
       IdFilter idFilter = GoIdFilter.getTestsFilter(project);

src/com/goide/runconfig/testing/GoTestRunningState.java

@@ -73,7 +73,7 @@ public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunne
 
     GoTestConsoleProperties consoleProperties = new GoTestConsoleProperties(myConfiguration, executor);
     String frameworkName = myConfiguration.getTestFramework().getName();
-    ConsoleView consoleView = SMTestRunnerConnectionUtil.createAndAttachConsole(frameworkName, processHandler, consoleProperties);
+    final ConsoleView consoleView = SMTestRunnerConnectionUtil.createAndAttachConsole(frameworkName, processHandler, consoleProperties);
     consoleView.addMessageFilter(new GoConsoleFilter(myConfiguration.getProject(), myModule, myConfiguration.getWorkingDirectoryUrl()));
     ProcessTerminatedListener.attach(processHandler);