diff options
author | nhauge | 2011-02-22 17:00:30 +0000 |
---|---|---|
committer | nhauge | 2011-02-22 17:00:30 +0000 |
commit | 0fe198a92649cb378ab85f8c41aa1242bc04c94f (patch) | |
tree | d630618aa57a30e89a29d16159fffbc5225a0dfb /jpa | |
parent | c070d8748410e89bda89d18f21b8d635aa304da0 (diff) | |
download | webtools.dali-0fe198a92649cb378ab85f8c41aa1242bc04c94f.tar.gz webtools.dali-0fe198a92649cb378ab85f8c41aa1242bc04c94f.tar.xz webtools.dali-0fe198a92649cb378ab85f8c41aa1242bc04c94f.zip |
[337743] Fix source compatibility issue with new version of ICU4J 4.4.2. This is a temporary change to get the build compiling.
Diffstat (limited to 'jpa')
2 files changed, 11 insertions, 6 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java index cac8094c2a..e349e72384 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java @@ -9,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.details; +import java.util.Comparator; import java.util.Iterator; import org.eclipse.jpt.common.ui.internal.widgets.Pane; @@ -69,7 +70,6 @@ public class MappedByPane JpaHelpContextIds.MAPPING_MAPPED_BY); } - @SuppressWarnings("unchecked") protected ListValueModel<String> buildCandidateAttributesListValueModel() { return new SortedListValueModelAdapter<String>( new CollectionAspectAdapter<MappedByRelationshipStrategy, String>( @@ -79,7 +79,11 @@ public class MappedByPane return this.subject.candidateMappedByAttributeNames(); } }, - Collator.getInstance() + new Comparator<String>() { + public int compare(String string1, String string2){ + return Collator.getInstance().compare(string1, string2); + } + } ); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java index 84a6c706e3..c6454aac56 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java @@ -143,10 +143,11 @@ public class JpaProjectPropertiesPage private static final String BUILD_PATHS_PROPERTY_PAGE_ID = "org.eclipse.jdt.ui.propertyPages.BuildPathsPropertyPage"; //$NON-NLS-1$ - - @SuppressWarnings("unchecked") - /* private */ static final Comparator<String> STRING_COMPARATOR = Collator.getInstance(); - + /* private */ static final Comparator<String> STRING_COMPARATOR = new Comparator<String>() { + public int compare(String string1, String string2){ + return Collator.getInstance().compare(string1, string2); + } + }; // ************ construction ************ |