xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2885 Update PDE build to Java 1.7. Fix code that is now an error in Java 1.7.

Browse source 
Amend: changed to use set method.

Change-Id: I39cb36937fb9faafe24f2e87a897ae78c7c660e1

Former-commit-id: 770f675138 [formerly cb89c806c8] [formerly 08ee82c39a] [formerly b535c90a23 [formerly 08ee82c39a [formerly 5c5eb6f348627f65afc527205c5bc1f7b7463ddb]]]
Former-commit-id: b535c90a23
Former-commit-id: 11734a11ae5f09b05df469fcfb5ec781a7813557 [formerly e54ab69bf7]
Former-commit-id: 48b19f3833
This commit is contained in:
Brad Gonzales 2014-03-06 09:46:59 -06:00
parent 8b23913692
commit 5fae9e6577
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/build.edex/edex/build.properties
View file

@ -208,8 +208,8 @@ javacVerbose=true
compilerArg=-g:lines,source 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 # 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. # 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 generateVersionsLists=true

3
edexOsgi/com.raytheon.uf.common.auth/src/com/raytheon/uf/common/auth/req/AbstractPrivilegedRequest.java
View file

@ -34,6 +34,7 @@ import com.raytheon.uf.common.serialization.comm.IServerRequest;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* May 18, 2010 mschenke Initial creation * May 18, 2010 mschenke Initial creation
* Mar 06, 2014 2885 bgonzale Fix code that is now an error in Java 1.7.
* *
* </pre> * </pre>
* *
@ -70,7 +71,7 @@ public abstract class AbstractPrivilegedRequest implements IServerRequest {
Class<T> clazz, IUser user) throws AuthException { Class<T> clazz, IUser user) throws AuthException {
try { try {
T request = clazz.newInstance(); T request = clazz.newInstance();
request.user = user; request.setUser(user);
return request; return request;
} catch (Exception e) { } catch (Exception e) {
throw new AuthException("Error instantiating privileged request: " throw new AuthException("Error instantiating privileged request: "