Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbvosburgh2012-03-01 16:59:13 +0000
committerbvosburgh2012-03-01 16:59:13 +0000
commit30be4060dc4c3e53bdf9b843aff52e32d8dc6f79 (patch)
tree61ce3bd10e768919d3bc01a79a26516deb9cebbe /common/plugins
parentf172512976150eb96aa829afcf2801c1cb80bbf4 (diff)
downloadwebtools.dali-30be4060dc4c3e53bdf9b843aff52e32d8dc6f79.tar.gz
webtools.dali-30be4060dc4c3e53bdf9b843aff52e32d8dc6f79.tar.xz
webtools.dali-30be4060dc4c3e53bdf9b843aff52e32d8dc6f79.zip
fix compiler warnings
Diffstat (limited to 'common/plugins')
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryMember.java10
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceAbstractType.java8
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java6
3 files changed, 11 insertions, 13 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryMember.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryMember.java
index d8cb8f1c1e..0e10c700cb 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryMember.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryMember.java
@@ -209,7 +209,7 @@ abstract class BinaryMember
String typeParameterName = Signature.toString(erasureSignature);
for (ITypeParameter typeParameter : typeParameters) {
if (typeParameterName.equals(typeParameter.getElementName())) {
- String[] bounds = (typeParameter == null) ? new String[0] : typeParameter.getBoundsSignatures();
+ String[] bounds = typeParameter.getBoundsSignatures();
if (bounds.length > 0) {
return convertTypeSignatureToTypeName_(bounds[0], typeParameters);
}
@@ -228,12 +228,10 @@ abstract class BinaryMember
else if (Signature.getTypeSignatureKind(erasureSignature) == Signature.WILDCARD_TYPE_SIGNATURE) {
// if signature is ? (wildcard) or ? super X (bottom bounded), return top bound, which is Object
if (String.valueOf(Signature.C_STAR).equals(erasureSignature) || erasureSignature.startsWith(String.valueOf(Signature.C_SUPER))) {
- return "java.lang.Object";
- }
- // else return top bound
- else {
- return Signature.toString(erasureSignature.substring(1));
+ return Object.class.getName();
}
+ // return top bound
+ return Signature.toString(erasureSignature.substring(1));
}
return Signature.toString(erasureSignature);
}
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceAbstractType.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceAbstractType.java
index 533b3083c3..49f6b04abd 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceAbstractType.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceAbstractType.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -162,10 +162,10 @@ abstract class SourceAbstractType<A extends AbstractType>
return this.memberType;
}
- private void syncMemberType(boolean memberType) {
+ private void syncMemberType(boolean astMemberType) {
boolean old = this.memberType;
- this.memberType = memberType;
- this.firePropertyChanged(MEMBER_TYPE_PROPERTY, old, memberType);
+ this.memberType = astMemberType;
+ this.firePropertyChanged(MEMBER_TYPE_PROPERTY, old, astMemberType);
}
private boolean buildMemberType(ITypeBinding binding) {
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java
index f28e79420e..24cdd48820 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java
@@ -218,10 +218,10 @@ final class SourceType
return this.hasNoArgConstructor;
}
- private void syncHasNoArgConstructor(boolean hasNoArgConstructor) {
+ private void syncHasNoArgConstructor(boolean astHasNoArgConstructor) {
boolean old = this.hasNoArgConstructor;
- this.hasNoArgConstructor = hasNoArgConstructor;
- this.firePropertyChanged(NO_ARG_CONSTRUCTOR_PROPERTY, old, hasNoArgConstructor);
+ this.hasNoArgConstructor = astHasNoArgConstructor;
+ this.firePropertyChanged(NO_ARG_CONSTRUCTOR_PROPERTY, old, astHasNoArgConstructor);
}
private boolean buildHasNoArgConstructor(ITypeBinding binding) {

Back to the top