1.1 --- a/api.debugger.jpda/src/org/netbeans/api/debugger/jpda/JDIVariable.java Fri Jun 18 16:37:35 2010 +0200
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,62 +0,0 @@
1.4 -/*
1.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.6 - *
1.7 - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1.8 - *
1.9 - * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1.10 - * Other names may be trademarks of their respective owners.
1.11 - *
1.12 - * The contents of this file are subject to the terms of either the GNU
1.13 - * General Public License Version 2 only ("GPL") or the Common
1.14 - * Development and Distribution License("CDDL") (collectively, the
1.15 - * "License"). You may not use this file except in compliance with the
1.16 - * License. You can obtain a copy of the License at
1.17 - * http://www.netbeans.org/cddl-gplv2.html
1.18 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
1.19 - * specific language governing permissions and limitations under the
1.20 - * License. When distributing the software, include this License Header
1.21 - * Notice in each file and include the License file at
1.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1.23 - * particular file as subject to the "Classpath" exception as provided
1.24 - * by Oracle in the GPL Version 2 section of the License file that
1.25 - * accompanied this code. If applicable, add the following below the
1.26 - * License Header, with the fields enclosed by brackets [] replaced by
1.27 - * your own identifying information:
1.28 - * "Portions Copyrighted [year] [name of copyright owner]"
1.29 - *
1.30 - * Contributor(s):
1.31 - *
1.32 - * The Original Software is NetBeans. The Initial Developer of the Original
1.33 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
1.34 - * Microsystems, Inc. All Rights Reserved.
1.35 - *
1.36 - * If you wish your version of this file to be governed by only the CDDL
1.37 - * or only the GPL Version 2, indicate your decision by adding
1.38 - * "[Contributor] elects to include this software in this distribution
1.39 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
1.40 - * single choice of license, a recipient has the option to distribute
1.41 - * your version of this file under either the CDDL, the GPL Version 2 or
1.42 - * to extend the choice of license to its licensees as provided above.
1.43 - * However, if you add GPL Version 2 code and therefore, elected the GPL
1.44 - * Version 2 license, then the option applies only if the new code is
1.45 - * made subject to such option by the copyright holder.
1.46 - */
1.47 -
1.48 -package org.netbeans.api.debugger.jpda;
1.49 -
1.50 -import com.sun.jdi.Value;
1.51 -
1.52 -/**
1.53 - * This interface is implemented by variables to provide the appropriate JDI value.
1.54 - *
1.55 - * @author Martin Entlicher
1.56 - */
1.57 -public interface JDIVariable extends Variable {
1.58 -
1.59 - /**
1.60 - * Provides the raw JDI value.
1.61 - * @return The JDI value of the variable.
1.62 - */
1.63 - Value getJDIValue();
1.64 -
1.65 -}
2.1 --- a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/JPDADebuggerImpl.java Fri Jun 18 16:37:35 2010 +0200
2.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/JPDADebuggerImpl.java Thu Jun 24 14:56:06 2010 +0200
2.3 @@ -132,7 +132,7 @@
2.4 import org.netbeans.modules.debugger.jpda.models.JPDAClassTypeImpl;
2.5 import org.netbeans.modules.debugger.jpda.models.ThreadsCache;
2.6 import org.netbeans.modules.debugger.jpda.util.Operator;
2.7 -import org.netbeans.api.debugger.jpda.JDIVariable;
2.8 +import org.netbeans.modules.debugger.jpda.expr.JDIVariable;
2.9 import org.netbeans.modules.debugger.jpda.jdi.ClassTypeWrapper;
2.10 import org.netbeans.modules.debugger.jpda.jdi.IllegalThreadStateExceptionWrapper;
2.11 import org.netbeans.modules.debugger.jpda.jdi.IntegerValueWrapper;
3.1 --- a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/FieldBreakpointImpl.java Fri Jun 18 16:37:35 2010 +0200
3.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/FieldBreakpointImpl.java Thu Jun 24 14:56:06 2010 +0200
3.3 @@ -66,7 +66,7 @@
3.4 import org.netbeans.api.debugger.jpda.JPDAThread;
3.5 import org.netbeans.api.debugger.jpda.ObjectVariable;
3.6 import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl;
3.7 -import org.netbeans.api.debugger.jpda.JDIVariable;
3.8 +import org.netbeans.modules.debugger.jpda.expr.JDIVariable;
3.9 import org.netbeans.modules.debugger.jpda.jdi.ClassNotPreparedExceptionWrapper;
3.10 import org.netbeans.modules.debugger.jpda.jdi.InternalExceptionWrapper;
3.11 import org.netbeans.modules.debugger.jpda.jdi.InvalidRequestStateExceptionWrapper;
4.1 --- a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/LineBreakpointImpl.java Fri Jun 18 16:37:35 2010 +0200
4.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/LineBreakpointImpl.java Thu Jun 24 14:56:06 2010 +0200
4.3 @@ -97,7 +97,7 @@
4.4 import org.netbeans.modules.debugger.jpda.EditorContextBridge;
4.5 import org.netbeans.modules.debugger.jpda.SourcePath;
4.6 import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl;
4.7 -import org.netbeans.api.debugger.jpda.JDIVariable;
4.8 +import org.netbeans.modules.debugger.jpda.expr.JDIVariable;
4.9 import org.netbeans.modules.debugger.jpda.jdi.ClassNotPreparedExceptionWrapper;
4.10 import org.netbeans.modules.debugger.jpda.jdi.InternalExceptionWrapper;
4.11 import org.netbeans.modules.debugger.jpda.jdi.InvalidRequestStateExceptionWrapper;
5.1 --- a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/MethodBreakpointImpl.java Fri Jun 18 16:37:35 2010 +0200
5.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/MethodBreakpointImpl.java Thu Jun 24 14:56:06 2010 +0200
5.3 @@ -72,7 +72,7 @@
5.4 import org.netbeans.api.debugger.jpda.MethodBreakpoint;
5.5 import org.netbeans.api.debugger.jpda.ObjectVariable;
5.6 import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl;
5.7 -import org.netbeans.api.debugger.jpda.JDIVariable;
5.8 +import org.netbeans.modules.debugger.jpda.expr.JDIVariable;
5.9 import org.netbeans.modules.debugger.jpda.jdi.ClassNotPreparedExceptionWrapper;
5.10 import org.netbeans.modules.debugger.jpda.jdi.InternalExceptionWrapper;
5.11 import org.netbeans.modules.debugger.jpda.jdi.InvalidRequestStateExceptionWrapper;
6.1 --- a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java Fri Jun 18 16:37:35 2010 +0200
6.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java Thu Jun 24 14:56:06 2010 +0200
6.3 @@ -44,7 +44,6 @@
6.4
6.5 package org.netbeans.modules.debugger.jpda.expr;
6.6
6.7 -import org.netbeans.api.debugger.jpda.JDIVariable;
6.8 import com.sun.jdi.AbsentInformationException;
6.9 import com.sun.jdi.ArrayReference;
6.10 import com.sun.jdi.ArrayType;
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/JDIVariable.java Thu Jun 24 14:56:06 2010 +0200
7.3 @@ -0,0 +1,59 @@
7.4 +/*
7.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
7.6 + *
7.7 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
7.8 + *
7.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7.10 + * Other names may be trademarks of their respective owners.
7.11 + *
7.12 + * The contents of this file are subject to the terms of either the GNU
7.13 + * General Public License Version 2 only ("GPL") or the Common
7.14 + * Development and Distribution License("CDDL") (collectively, the
7.15 + * "License"). You may not use this file except in compliance with the
7.16 + * License. You can obtain a copy of the License at
7.17 + * http://www.netbeans.org/cddl-gplv2.html
7.18 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
7.19 + * specific language governing permissions and limitations under the
7.20 + * License. When distributing the software, include this License Header
7.21 + * Notice in each file and include the License file at
7.22 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
7.23 + * particular file as subject to the "Classpath" exception as provided
7.24 + * by Oracle in the GPL Version 2 section of the License file that
7.25 + * accompanied this code. If applicable, add the following below the
7.26 + * License Header, with the fields enclosed by brackets [] replaced by
7.27 + * your own identifying information:
7.28 + * "Portions Copyrighted [year] [name of copyright owner]"
7.29 + *
7.30 + * Contributor(s):
7.31 + *
7.32 + * The Original Software is NetBeans. The Initial Developer of the Original
7.33 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
7.34 + * Microsystems, Inc. All Rights Reserved.
7.35 + *
7.36 + * If you wish your version of this file to be governed by only the CDDL
7.37 + * or only the GPL Version 2, indicate your decision by adding
7.38 + * "[Contributor] elects to include this software in this distribution
7.39 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
7.40 + * single choice of license, a recipient has the option to distribute
7.41 + * your version of this file under either the CDDL, the GPL Version 2 or
7.42 + * to extend the choice of license to its licensees as provided above.
7.43 + * However, if you add GPL Version 2 code and therefore, elected the GPL
7.44 + * Version 2 license, then the option applies only if the new code is
7.45 + * made subject to such option by the copyright holder.
7.46 + */
7.47 +
7.48 +package org.netbeans.modules.debugger.jpda.expr;
7.49 +
7.50 +import com.sun.jdi.Value;
7.51 +import org.netbeans.api.debugger.jpda.Variable;
7.52 +
7.53 +/**
7.54 + * A primitive variable, which provides the appropriate JDI value.
7.55 + *
7.56 + * @author Martin Entlicher
7.57 + */
7.58 +public interface JDIVariable extends Variable {
7.59 +
7.60 + Value getJDIValue();
7.61 +
7.62 +}
8.1 --- a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java Fri Jun 18 16:37:35 2010 +0200
8.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java Thu Jun 24 14:56:06 2010 +0200
8.3 @@ -93,7 +93,7 @@
8.4 import org.netbeans.api.debugger.jpda.Variable;
8.5 import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl;
8.6 import org.netbeans.modules.debugger.jpda.expr.EvaluatorVisitor;
8.7 -import org.netbeans.api.debugger.jpda.JDIVariable;
8.8 +import org.netbeans.modules.debugger.jpda.expr.JDIVariable;
8.9 import org.netbeans.modules.debugger.jpda.jdi.ArrayReferenceWrapper;
8.10 import org.netbeans.modules.debugger.jpda.jdi.ClassNotPreparedExceptionWrapper;
8.11 import org.netbeans.modules.debugger.jpda.jdi.ClassObjectReferenceWrapper;
9.1 --- a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ArrayFieldVariable.java Fri Jun 18 16:37:35 2010 +0200
9.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ArrayFieldVariable.java Thu Jun 24 14:56:06 2010 +0200
9.3 @@ -59,7 +59,7 @@
9.4 import org.netbeans.api.debugger.jpda.JPDAClassType;
9.5 import org.netbeans.api.debugger.jpda.ObjectVariable;
9.6 import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl;
9.7 -import org.netbeans.api.debugger.jpda.JDIVariable;
9.8 +import org.netbeans.modules.debugger.jpda.expr.JDIVariable;
9.9 import org.netbeans.modules.debugger.jpda.jdi.ArrayReferenceWrapper;
9.10 import org.netbeans.modules.debugger.jpda.jdi.InternalExceptionWrapper;
9.11 import org.netbeans.modules.debugger.jpda.jdi.ObjectCollectedExceptionWrapper;
10.1 --- a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ObjectArrayFieldVariable.java Fri Jun 18 16:37:35 2010 +0200
10.2 +++ b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ObjectArrayFieldVariable.java Thu Jun 24 14:56:06 2010 +0200
10.3 @@ -55,7 +55,7 @@
10.4 import org.netbeans.api.debugger.jpda.JPDAClassType;
10.5 import org.netbeans.api.debugger.jpda.ObjectVariable;
10.6 import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl;
10.7 -import org.netbeans.api.debugger.jpda.JDIVariable;
10.8 +import org.netbeans.modules.debugger.jpda.expr.JDIVariable;
10.9 import org.netbeans.modules.debugger.jpda.jdi.ArrayReferenceWrapper;
10.10 import org.netbeans.modules.debugger.jpda.jdi.InternalExceptionWrapper;
10.11 import org.netbeans.modules.debugger.jpda.jdi.ObjectCollectedExceptionWrapper;
11.1 --- a/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/EvaluatorTest.java Fri Jun 18 16:37:35 2010 +0200
11.2 +++ b/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/EvaluatorTest.java Thu Jun 24 14:56:06 2010 +0200
11.3 @@ -55,6 +55,7 @@
11.4 import junit.framework.AssertionFailedError;
11.5 import org.netbeans.api.debugger.DebuggerManager;
11.6 import org.netbeans.junit.NbTestCase;
11.7 +import org.netbeans.modules.debugger.jpda.expr.JDIVariable;
11.8
11.9 /**
11.10 * Tests evaluation of various expressions.