Fix syntax errors in decompiled sources

Author: emmanue1

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/AddCastExpressionVisitor.java

@@ -21,6 +21,8 @@
 import static org.jd.core.v1.model.javasyntax.type.ObjectType.TYPE_OBJECT;
 
 public class AddCastExpressionVisitor extends AbstractJavaSyntaxVisitor {
+    protected SearchFirstLineNumberVisitor searchFirstLineNumberVisitor = new SearchFirstLineNumberVisitor();
+
     protected TypeMaker typeMaker;
     protected Type returnedType;
     protected Type type;
@@ -177,7 +179,7 @@ public void visit(MethodInvocationExpression expression) {
             parameters.accept(this);
             expression.setParameters(updateExpressions(mie.getParameterTypes(), parameters));
         }
-
+        
         expression.getExpression().accept(this);
     }
 
@@ -203,6 +205,19 @@ public void visit(NewInitializedArray expression) {
         }
     }
 
+    @Override
+    public void visit(FieldReferenceExpression expression) {
+        Expression exp = expression.getExpression();
+
+        if ((exp != null) && (exp.getClass() != ObjectTypeReferenceExpression.class)) {
+            Type type = typeMaker.makeFromInternalTypeName(expression.getInternalTypeName());
+
+            if (type.getName() != null) {
+                expression.setExpression(updateExpression(type, exp));
+            }
+        }
+    }
+
     @Override
     public void visit(BinaryOperatorExpression expression) {
         expression.getLeftExpression().accept(this);
@@ -313,7 +328,7 @@ private static final boolean match(Expression expression) {
         return true;
     }
 
-    private static final Expression addCastExpression(Type type, Expression expression) {
+    private Expression addCastExpression(Type type, Expression expression) {
         if (expression.getClass() == CastExpression.class) {
             CastExpression ce = (CastExpression)expression;
 
@@ -324,7 +339,9 @@ private static final Expression addCastExpression(Type type, Expression expressi
                 return ce;
             }
         } else {
-            return new CastExpression(expression.getLineNumber(), type, expression);
+            searchFirstLineNumberVisitor.init();
+            expression.accept(searchFirstLineNumberVisitor);
+            return new CastExpression(searchFirstLineNumberVisitor.getLineNumber(), type, expression);
         }
     }