Changeset 1128 for trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui
- Timestamp:
- 11/22/11 21:10:11 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/filters/FilterDescriptor.java
r1104 r1128 27 27 * since 0.6.8 28 28 */ 29 @SuppressWarnings("unchecked") 30 public class FilterDescriptor implements Comparable, IPluginContribution { 29 public class FilterDescriptor implements Comparable<FilterDescriptor>, IPluginContribution { 31 30 32 31 private static String PATTERN_FILTER_ID_PREFIX= "_patternFilterId_"; //$NON-NLS-1$ … … 67 66 public static FilterDescriptor[] getFilterDescriptors(String targetId) { 68 67 FilterDescriptor[] filterDescs= FilterDescriptor.getFilterDescriptors(); 69 List result= new ArrayList(filterDescs.length);70 for ( int i= 0; i < filterDescs.length; i++) {71 String tid= filterDesc s[i].getTargetId();72 if (WorkbenchActivityHelper.filterItem(filterDesc s[i]))68 List<FilterDescriptor> result= new ArrayList<FilterDescriptor>(); 69 for (FilterDescriptor filterDesc : filterDescs) { 70 String tid= filterDesc.getTargetId(); 71 if (WorkbenchActivityHelper.filterItem(filterDesc)) 73 72 continue; 74 73 if (tid == null || tid.equals(targetId)) 75 result.add(filterDesc s[i]);74 result.add(filterDesc); 76 75 } 77 return (FilterDescriptor[])result.toArray(new FilterDescriptor[result.size()]);76 return result.toArray(new FilterDescriptor[0]); 78 77 } 79 78 … … 207 206 * Implements a method from IComparable 208 207 */ 209 public int compareTo(Object o) { 210 if (o instanceof FilterDescriptor) 211 return Collator.getInstance().compare(getName(), ((FilterDescriptor)o).getName()); 212 else 213 return Integer.MIN_VALUE; 208 public int compareTo(FilterDescriptor o) { 209 return Collator.getInstance().compare(getName(), ((FilterDescriptor)o).getName()); 214 210 } 215 211 … … 220 216 */ 221 217 private static FilterDescriptor[] createFilterDescriptors(IConfigurationElement[] elements) { 222 List result= new ArrayList(5); 223 Set descIds= new HashSet(5); 224 for (int i= 0; i < elements.length; i++) { 225 final IConfigurationElement element= elements[i]; 218 List<FilterDescriptor> result= new ArrayList<FilterDescriptor>(); 219 Set<String> descIds= new HashSet<String>(); 220 for (final IConfigurationElement element : elements) { 226 221 if (FILTER_TAG.equals(element.getName())) { 227 228 222 final FilterDescriptor[] desc= new FilterDescriptor[1]; 229 223 SafeRunner.run(new SafeRunnable(FilterMessages.FilterDescriptor_filterDescriptionCreationError_message) { 230 224 public void run() throws Exception { 231 desc[0] = new FilterDescriptor(element);225 desc[0] = new FilterDescriptor(element); 232 226 } 233 227 }); … … 239 233 } 240 234 } 241 return (FilterDescriptor[])result.toArray(new FilterDescriptor[result.size()]); 235 236 FilterDescriptor[] resultArray = result.toArray(new FilterDescriptor[0]); 237 return resultArray; 242 238 } 243 239
Note: See TracChangeset
for help on using the changeset viewer.