Changeset 1113 for trunk/org.modelica.mdt.ui/src/org/modelica

Timestamp:

11/22/11 19:38:16 (13 years ago)

Author:

masberg

Message:

Use generics.

File:

• trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/actions/CustomFiltersActionGroup.java (modified) (21 diffs)

trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/actions/CustomFiltersActionGroup.java

@@ -48 +48 @@
 import java.util.StringTokenizer;
 import java.util.TreeSet;
-import java.util.Map.Entry;
 
 import org.eclipse.swt.SWT;
@@ -94 +93 @@
  * @since 0.6.8
  */
-@SuppressWarnings("unchecked")
 public class CustomFiltersActionGroup extends ActionGroup {
 
@@ -184 +182 @@
 
     private NamePatternFilter fPatternFilter;
-    private Map fInstalledBuiltInFilters;
-    
-    private Map/*<String, Boolean>*/ fEnabledFilterIds;
+    private Map<String, ViewerFilter> fInstalledBuiltInFilters;
+    
+    private Map<String, Boolean> fEnabledFilterIds;
     private boolean fUserDefinedPatternsEnabled;
     private String[] fUserDefinedPatterns;
@@ -196 +194 @@
      * @since 0.6.8
      */
-    private Stack fLRUFilterIdsStack; 
+    private Stack<String> fLRUFilterIdsStack; 
     /**
      * Handle to menu manager to dynamically update
@@ -217 +215 @@
      */
     private String[] fFilterIdsUsedInLastViewMenu;
-    private HashMap fFilterDescriptorMap;
+    private Map<String, FilterDescriptor> fFilterDescriptorMap;
     private String fTargetId;
     
@@ -242 +240 @@
         fViewer= viewer;
 
-        fLRUFilterIdsStack= new Stack();
+        fLRUFilterIdsStack= new Stack<String>();
 
         initializeWithPluginContributions();
@@ -271 +269 @@
      */
     public String[] internalGetEnabledFilterIds() {
-        Set enabledFilterIds= new HashSet(fEnabledFilterIds.size());
-        Iterator iter= fEnabledFilterIds.entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry entry= (Map.Entry)iter.next();
-            String id= (String)entry.getKey();
-            boolean isEnabled= ((Boolean)entry.getValue()).booleanValue();
-            if (isEnabled)
+        Set<String> enabledFilterIds= new HashSet<String>();
+        for (Map.Entry<String, Boolean> entry : fEnabledFilterIds.entrySet()) {
+            String id= entry.getKey();
+            boolean isEnabled = entry.getValue();
+            if (isEnabled) {
                 enabledFilterIds.add(id);
-        }
-        return (String[])enabledFilterIds.toArray(new String[enabledFilterIds.size()]);
+            }
+        }
+        String[] enabledFilterIdsArray = enabledFilterIds.toArray(new String[0]);
+        return enabledFilterIdsArray;
     }
 
@@ -295 +293 @@
     public String[] removeFiltersFor(Object parent, Object element, IContentProvider contentProvider) {
         String[] enabledFilters= internalGetEnabledFilterIds();
-        Set newFilters= new HashSet();
-        for (int i= 0; i < enabledFilters.length; i++) {
-            String filterName= enabledFilters[i];
-            ViewerFilter filter= (ViewerFilter) fInstalledBuiltInFilters.get(filterName);
-            if (filter == null)
+        Set<String> newFilters= new HashSet<String>();
+        for (String filterName : enabledFilters) {
+            ViewerFilter filter= fInstalledBuiltInFilters.get(filterName);
+            if (filter == null) {
                 newFilters.add(filterName);
-            else if (isSelected(parent, element, contentProvider, filter)) 
+            }
+            else if (isSelected(parent, element, contentProvider, filter)) { 
                 newFilters.add(filterName);
+            }
         }
-        if (newFilters.size() == enabledFilters.length)
-            return new String[0];
-        return (String[])newFilters.toArray(new String[newFilters.size()]);
+        
+        String[] newFiltersArray = new String[0];
+        
+        if (newFilters.size() != enabledFilters.length) {
+            Assert.isTrue(newFilters.size() < enabledFilters.length);
+            newFiltersArray = newFilters.toArray(new String[0]);
+        }
+        
+        return newFiltersArray;
     }
     
@@ -351 +356 @@
         
     private void setEnabledFilterIds(String[] enabledIds) {
-        Iterator iter= fEnabledFilterIds.keySet().iterator();
-        while (iter.hasNext()) {
-            String id= (String)iter.next();
-            fEnabledFilterIds.put(id, Boolean.FALSE);
-        }
-        for (int i= 0; i < enabledIds.length; i++)
-            fEnabledFilterIds.put(enabledIds[i], Boolean.TRUE);
+        for (String id : fEnabledFilterIds.keySet()) {
+            fEnabledFilterIds.put(id, false);
+        }
+        
+        for (String id : enabledIds) {
+            fEnabledFilterIds.put(id, true);
+        }
     }
 
@@ -371 +376 @@
      * @since 3.0
      */
-    private void setRecentlyChangedFilters(Stack changeHistory) {
-        Stack oldestFirstStack= new Stack();
+    private void setRecentlyChangedFilters(Stack<FilterDescriptor> changeHistory) {
+        Stack<String> oldestFirstStack= new Stack<String>();
         
         int length= Math.min(changeHistory.size(), MAX_FILTER_MENU_ENTRIES);
-        for (int i= 0; i < length; i++)
-            oldestFirstStack.push(((FilterDescriptor)changeHistory.pop()).getId());
+        for (int i= 0; i < length; i++) {
+            FilterDescriptor filterDesc = changeHistory.pop();
+            String id = filterDesc.getId();
+            oldestFirstStack.push(id);
+        }
         
         length= Math.min(fLRUFilterIdsStack.size(), MAX_FILTER_MENU_ENTRIES - oldestFirstStack.size());
         int NEWEST= 0;
         for (int i= 0; i < length; i++) {
-            Object filter= fLRUFilterIdsStack.remove(NEWEST);
-            if (!oldestFirstStack.contains(filter))
+            String filter= fLRUFilterIdsStack.remove(NEWEST);
+            if (!oldestFirstStack.contains(filter)) {
                 oldestFirstStack.push(filter);
-        }
-        fLRUFilterIdsStack= oldestFirstStack;
+            }
+        }
+        fLRUFilterIdsStack = oldestFirstStack;
     }
     
@@ -439 +448 @@
         }
         
-        SortedSet sortedFilters= new TreeSet(fLRUFilterIdsStack);
+        SortedSet<String> sortedFilters= new TreeSet<String>(fLRUFilterIdsStack);
         String[] recentlyChangedFilterIds= (String[])sortedFilters.toArray(new String[sortedFilters.size()]);
         
@@ -466 +475 @@
     
     private void initializeWithPluginContributions() {
-        fUserDefinedPatterns= new String[0];
-        fUserDefinedPatternsEnabled= false;
-
-        FilterDescriptor[] filterDescs= getCachedFilterDescriptors();
-        fFilterDescriptorMap= new HashMap(filterDescs.length);
-        fEnabledFilterIds= new HashMap(filterDescs.length);
-        for (int i= 0; i < filterDescs.length; i++) {
-            String id= filterDescs[i].getId();
-            Boolean isEnabled= Boolean.valueOf(filterDescs[i].isEnabled());
-            if (fEnabledFilterIds.containsKey(id))
-                System.err.println("duplicateFilterId:"+id); 
+        fUserDefinedPatterns = new String[0];
+        fUserDefinedPatternsEnabled = false;
+
+        FilterDescriptor[] filterDescs = getCachedFilterDescriptors();
+        fFilterDescriptorMap = new HashMap<String, FilterDescriptor>();
+        fEnabledFilterIds = new HashMap<String, Boolean>();
+        for (FilterDescriptor filterDesc : filterDescs) {
+            String id= filterDesc.getId();
+            boolean isEnabled= filterDesc.isEnabled();
+            if (fEnabledFilterIds.containsKey(id)) {
+                System.err.println("duplicateFilterId: " + id);
+            }
             fEnabledFilterIds.put(id, isEnabled);
-            fFilterDescriptorMap.put(id, filterDescs[i]);
+            fFilterDescriptorMap.put(id, filterDesc);
         }
     }
@@ -485 +495 @@
     
     private void installFilters() {
-        fInstalledBuiltInFilters= new HashMap(fEnabledFilterIds.size());
+        fInstalledBuiltInFilters= new HashMap<String, ViewerFilter>(fEnabledFilterIds.size());
         fPatternFilter= new NamePatternFilter();
         fPatternFilter.setPatterns(getUserAndBuiltInPatterns());
@@ -503 +513 @@
     
     private void updateBuiltInFilters() {
-        Set installedFilters= fInstalledBuiltInFilters.keySet();
-        Set filtersToAdd= new HashSet(fEnabledFilterIds.size());
-        Set filtersToRemove= new HashSet(fEnabledFilterIds.size());
-        Iterator iter= fEnabledFilterIds.entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry entry= (Map.Entry)iter.next();
-            String id= (String)entry.getKey();
-            boolean isEnabled= ((Boolean)entry.getValue()).booleanValue();
-            if (isEnabled && !installedFilters.contains(id))
+        Set<String> installedFilters= fInstalledBuiltInFilters.keySet();
+        Set<String> filtersToAdd= new HashSet<String>();
+        Set<String> filtersToRemove= new HashSet<String>();
+        for (Map.Entry<String, Boolean> entry : fEnabledFilterIds.entrySet()) {
+            String id = entry.getKey();
+            boolean isEnabled = entry.getValue();
+            if (isEnabled && !installedFilters.contains(id)) {
                 filtersToAdd.add(id);
-            else if (!isEnabled && installedFilters.contains(id))
+            }
+            else if (!isEnabled && installedFilters.contains(id)) {
                 filtersToRemove.add(id);
+            }
         }
         
         // Install the filters
         FilterDescriptor[] filterDescs= getCachedFilterDescriptors();
-        for (int i= 0; i < filterDescs.length; i++) {
-            String id= filterDescs[i].getId();
+        for (FilterDescriptor filterDesc : filterDescs) {
+            String id = filterDesc.getId();
             // just to double check - id should denote a custom filter anyway
-            boolean isCustomFilter= filterDescs[i].isCustomFilter();
+            boolean isCustomFilter = filterDesc.isCustomFilter();
             if (isCustomFilter) {
                 if (filtersToAdd.contains(id)) {
-                    ViewerFilter filter= filterDescs[i].createViewerFilter();
+                    ViewerFilter filter = filterDesc.createViewerFilter();
                     if (filter != null) {
                         fViewer.addFilter(filter);
@@ -532 +542 @@
                 }
                 if (filtersToRemove.contains(id)) {
-                    fViewer.removeFilter((ViewerFilter)fInstalledBuiltInFilters.get(id));
+                    fViewer.removeFilter(fInstalledBuiltInFilters.get(id));
                     fInstalledBuiltInFilters.remove(id);
                 }
@@ -540 +550 @@
 
     private String[] getUserAndBuiltInPatterns() {
-        List patterns= new ArrayList(fUserDefinedPatterns.length);
-        if (areUserDefinedPatternsEnabled())
+        List<String> patterns= new ArrayList<String>();
+        if (areUserDefinedPatternsEnabled()) {
             patterns.addAll(Arrays.asList(fUserDefinedPatterns));
+        }
         FilterDescriptor[] filterDescs= getCachedFilterDescriptors();
         for (int i= 0; i < filterDescs.length; i++) {
@@ -560 +571 @@
         setUserDefinedPatterns(CustomFiltersDialog.convertFromString("", SEPARATOR));
 
-        Iterator iter= fEnabledFilterIds.entrySet().iterator();
-        while (iter.hasNext()) 
-        {
-            Entry entry= (Entry) iter.next();
-            String id= (String) entry.getKey();
+        for (String id : fEnabledFilterIds.keySet()) {
             fEnabledFilterIds.put(id, true);
         }
@@ -585 +592 @@
         store.setValue(getPreferenceKey(TAG_USER_DEFINED_PATTERNS), CustomFiltersDialog.convertToString(fUserDefinedPatterns ,SEPARATOR));
 
-        Iterator iter= fEnabledFilterIds.entrySet().iterator();
+        for (Map.Entry<String, Boolean> entry : fEnabledFilterIds.entrySet()) {
+            String id = entry.getKey();
+            boolean isEnabled = entry.getValue();
+            store.setValue(id, isEnabled);
+        }
+
+        StringBuffer buf= new StringBuffer(fLRUFilterIdsStack.size() * 20);
+        
+        Iterator<String> iter= fLRUFilterIdsStack.iterator();
         while (iter.hasNext()) {
-            Map.Entry entry= (Map.Entry)iter.next();
-            String id= (String)entry.getKey();
-            boolean isEnabled= ((Boolean)entry.getValue()).booleanValue();
-            store.setValue(id, isEnabled);
-        }
-
-        StringBuffer buf= new StringBuffer(fLRUFilterIdsStack.size() * 20);
-        iter= fLRUFilterIdsStack.iterator();
-        while (iter.hasNext()) {
-            buf.append((String)iter.next());
+            buf.append(iter.next());
             buf.append(SEPARATOR);
         }
@@ -624 +630 @@
         if(fEnabledFilterIds != null && !fEnabledFilterIds.isEmpty()) {
             IMemento xmlDefinedFilters= memento.createChild(TAG_XML_DEFINED_FILTERS);
-            Iterator iter= fEnabledFilterIds.entrySet().iterator();
-            while (iter.hasNext()) {
-                Map.Entry entry= (Map.Entry)iter.next();
-                String id= (String)entry.getKey();
-                Boolean isEnabled= (Boolean)entry.getValue();
+            for (Map.Entry<String, Boolean> entry : fEnabledFilterIds.entrySet()) {
+                String id = entry.getKey();
+                Boolean isEnabled = entry.getValue();
                 IMemento child= xmlDefinedFilters.createChild(TAG_CHILD);
                 child.putString(TAG_FILTER_ID, id);
@@ -645 +649 @@
         if(fLRUFilterIdsStack != null && !fLRUFilterIdsStack.isEmpty()) {
             IMemento lruFilters= memento.createChild(TAG_LRU_FILTERS);
-            Iterator iter= fLRUFilterIdsStack.iterator();
-            while (iter.hasNext()) {
-                String id= (String)iter.next();
+            for (String id : fLRUFilterIdsStack) {
                 IMemento child= lruFilters.createChild(TAG_CHILD);
                 child.putString(TAG_FILTER_ID, id);
@@ -731 +733 @@
         if (!areUserDefinedPatternsEnabled())
             return;
-        List userDefinedPatterns= new ArrayList(Arrays.asList(fUserDefinedPatterns));
+        List<String> userDefinedPatterns = Arrays.asList(fUserDefinedPatterns);
         FilterDescriptor[] filters= getCachedFilterDescriptors();