Mercurial > hg > Members > kono > jpf-core

changeset 15:cb7500a46eab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some minor syntax fixes to make IntelliJ happy
author Peter Mehlitz <pcmehlitz@gmail.com>
date Wed, 18 Mar 2015 11:52:11 -0700
parents 7ba603d4ba20
children 08ca336d5928
files nbproject/project.xml src/main/gov/nasa/jpf/vm/FunctionObjectFactory.java src/main/gov/nasa/jpf/vm/InfoObject.java src/main/gov/nasa/jpf/vm/MethodInfo.java
diffstat 4 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/nbproject/project.xml	Mon Mar 16 19:39:36 2015 -0700
+++ b/nbproject/project.xml	Wed Mar 18 11:52:11 2015 -0700
@@ -280,13 +280,13 @@
             </compilation-unit>
             <compilation-unit>
                 <package-root>src/peers</package-root>
-                <classpath mode="compile">build/main:build/annotations</classpath>
+                <classpath mode="compile">build/annotations;build/main</classpath>
                 <built-to>build/peers</built-to>
                 <source-level>1.8</source-level>
             </compilation-unit>
             <compilation-unit>
                 <package-root>src/classes</package-root>
-                <classpath mode="compile">build/annotations:build/main</classpath>
+                <classpath mode="compile">build/annotations;build/main</classpath>
                 <built-to>build/classes</built-to>
                 <source-level>1.8</source-level>
             </compilation-unit>
--- a/src/main/gov/nasa/jpf/vm/FunctionObjectFactory.java	Mon Mar 16 19:39:36 2015 -0700
+++ b/src/main/gov/nasa/jpf/vm/FunctionObjectFactory.java	Wed Mar 18 11:52:11 2015 -0700
@@ -45,21 +45,21 @@
     for(int i = 0; i<freeVarTypeNames.length; i++) {
       String typeName = freeVarTypeNames[i];
       if (typeName.equals("byte")) {
-        fields.setByteValue(i, (byte)freeVarValues[i]);
+        fields.setByteValue(i, (Byte)freeVarValues[i]);
       } else if (typeName.equals("char")) {
-        fields.setCharValue(i, (char)freeVarValues[i]);
+        fields.setCharValue(i, (Character)freeVarValues[i]);
       } else if (typeName.equals("short")) {
-        fields.setShortValue(i, (short)freeVarValues[i]);
+        fields.setShortValue(i, (Short)freeVarValues[i]);
       } else if (typeName.equals("int")) {
-        fields.setIntValue(i, (int)freeVarValues[i]);
+        fields.setIntValue(i, (Integer)freeVarValues[i]);
       } else if (typeName.equals("float")) {
-        fields.setFloatValue(i, (float)freeVarValues[i]);
+        fields.setFloatValue(i, (Float)freeVarValues[i]);
       } else if (typeName.equals("long")) {
-        fields.setLongValue(i, (long)freeVarValues[i]);
+        fields.setLongValue(i, (Long)freeVarValues[i]);
       } else if (typeName.equals("double")) {
-        fields.setDoubleValue(i, (double)freeVarValues[i]);
+        fields.setDoubleValue(i, (Double)freeVarValues[i]);
       } else if (typeName.equals("boolean")) {
-        fields.setBooleanValue(i, (boolean)freeVarValues[i]);
+        fields.setBooleanValue(i, (Boolean)freeVarValues[i]);
       } else {
         int val = ((ElementInfo)freeVarValues[i]).getObjectRef();
         fields.setReferenceValue(i, val);
--- a/src/main/gov/nasa/jpf/vm/InfoObject.java	Mon Mar 16 19:39:36 2015 -0700
+++ b/src/main/gov/nasa/jpf/vm/InfoObject.java	Wed Mar 18 11:52:11 2015 -0700
@@ -194,7 +194,7 @@
       for (AbstractTypeAnnotationInfo ai : ais){
         if (targetType.isAssignableFrom(ai.getClass())){
           if (list == null){
-            list = new ArrayList<>();
+            list = new ArrayList();
           }
           list.add((T)ai);
         }
--- a/src/main/gov/nasa/jpf/vm/MethodInfo.java	Mon Mar 16 19:39:36 2015 -0700
+++ b/src/main/gov/nasa/jpf/vm/MethodInfo.java	Wed Mar 18 11:52:11 2015 -0700
@@ -1216,7 +1216,7 @@
       for (LocalVarInfo lv : localVars){
         if (lv.hasTypeAnnotations()){
           if (list == null){
-            list = new ArrayList<>();
+            list = new ArrayList<LocalVarInfo>();
           }
           list.add(lv);
         }
@@ -1238,7 +1238,7 @@
         AbstractTypeAnnotationInfo tai = lv.getTypeAnnotation(annotationClsName);
         if (tai != null){
           if (list == null){
-            list = new ArrayList<>();
+            list = new ArrayList<LocalVarInfo>();
           }
           list.add(lv);
         }