From 5fae9e6577d10e827d0624c4859c60bea24c31d3 Mon Sep 17 00:00:00 2001
From: Brad Gonzales <bradley_l_gonzales@raytheon.com>
Date: Thu, 6 Mar 2014 09:46:59 -0600
Subject: [PATCH] Issue #2885 Update PDE build to Java 1.7.  Fix code that is
 now an error in Java 1.7.

Amend: changed to use set method.

Change-Id: I39cb36937fb9faafe24f2e87a897ae78c7c660e1

Former-commit-id: 770f67513866d24ca844f6ef33171526836f2058 [formerly cb89c806c8e9bb3fec285a9082a560ddab25cd89] [formerly 08ee82c39a975bb43f802469b27aece72df8eb30] [formerly b535c90a23dadfe39af8573596d8d8d026608fcd [formerly 08ee82c39a975bb43f802469b27aece72df8eb30 [formerly 5c5eb6f348627f65afc527205c5bc1f7b7463ddb]]]
Former-commit-id: b535c90a23dadfe39af8573596d8d8d026608fcd
Former-commit-id: 11734a11ae5f09b05df469fcfb5ec781a7813557 [formerly e54ab69bf7c0781fb5f6770b73791c8a6f1ab994]
Former-commit-id: 48b19f3833d5ffc623fc89be86c1f2a8c9f722fb
---
 edexOsgi/build.edex/edex/build.properties                     | 4 ++--
 .../uf/common/auth/req/AbstractPrivilegedRequest.java         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/edexOsgi/build.edex/edex/build.properties b/edexOsgi/build.edex/edex/build.properties
index 6cd8bf70bf..79d29417bf 100644
--- a/edexOsgi/build.edex/edex/build.properties
+++ b/edexOsgi/build.edex/edex/build.properties
@@ -208,8 +208,8 @@ javacVerbose=true
 compilerArg=-g:lines,source
 
 # Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties
-javacSource=1.6
+javacSource=1.7
 
 # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties.
-javacTarget=1.6
+javacTarget=1.7
 generateVersionsLists=true
diff --git a/edexOsgi/com.raytheon.uf.common.auth/src/com/raytheon/uf/common/auth/req/AbstractPrivilegedRequest.java b/edexOsgi/com.raytheon.uf.common.auth/src/com/raytheon/uf/common/auth/req/AbstractPrivilegedRequest.java
index f4298af630..3058c48cbc 100644
--- a/edexOsgi/com.raytheon.uf.common.auth/src/com/raytheon/uf/common/auth/req/AbstractPrivilegedRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.auth/src/com/raytheon/uf/common/auth/req/AbstractPrivilegedRequest.java
@@ -34,6 +34,7 @@ import com.raytheon.uf.common.serialization.comm.IServerRequest;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 18, 2010            mschenke     Initial creation
+ * Mar 06, 2014 2885       bgonzale     Fix code that is now an error in Java 1.7.
  * 
  * </pre>
  * 
@@ -70,7 +71,7 @@ public abstract class AbstractPrivilegedRequest implements IServerRequest {
             Class<T> clazz, IUser user) throws AuthException {
         try {
             T request = clazz.newInstance();
-            request.user = user;
+            request.setUser(user);
             return request;
         } catch (Exception e) {
             throw new AuthException("Error instantiating privileged request: "