made project java 6 compatible

KeywordDesk · May 22, 2014 · 91939c2 · 91939c2
1 parent fbb9748
commit 91939c2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,8 +42,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/main/java/com/encircle360/keyworddesk/client/services/KeywordDeskApiService.java b/src/main/java/com/encircle360/keyworddesk/client/services/KeywordDeskApiService.java
@@ -146,25 +146,39 @@ public ArrayList<Keyword> getKeywordData(List<String> keywords, List<String> fie
 
             // add wanted fields to request object
             for (String field : fieldsToGet) {
-                switch (field) {
-                    case "searchVolume":
-                        keywordRequest.setSearchVolume(true);
-                        break;
 
-                    case "competition":
-                        keywordRequest.setCompetition(true);
-                        break;
-
-                    case "suggestedBid":
-                        keywordRequest.setSuggestedBid(true);
-                        break;
-
-                    case "googleResultCount":
-                        keywordRequest.setGoogleResultCount(true);
-                        break;
-
-                    case "googleInTitleCount":
-                        keywordRequest.setGoogleInTitleCount(true);
+                /** strings in switch are not supported in java < version 7
+                 switch (field) {
+                 case "searchVolume":
+                 keywordRequest.setSearchVolume(true);
+                 break;
+
+                 case "competition":
+                 keywordRequest.setCompetition(true);
+                 break;
+
+                 case "suggestedBid":
+                 keywordRequest.setSuggestedBid(true);
+                 break;
+
+                 case "googleResultCount":
+                 keywordRequest.setGoogleResultCount(true);
+                 break;
+
+                 case "googleInTitleCount":
+                 keywordRequest.setGoogleInTitleCount(true);
+                 }*/
+
+                if (field.equals("searchVolume")) {
+                    keywordRequest.setSearchVolume(true);
+                } else if (field.equals("competition")) {
+                    keywordRequest.setCompetition(true);
+                } else if (field.equals("suggestedBid")) {
+                    keywordRequest.setSuggestedBid(true);
+                } else if (field.equals("googleResultCount")) {
+                    keywordRequest.setGoogleResultCount(true);
+                } else if (field.equals("googleInTitleCount")) {
+                    keywordRequest.setGoogleInTitleCount(true);
                 }
             }