Changeset 1139 for trunk/org.modelica.mdt.debug.ui/src/org

Timestamp:

11/23/11 22:46:22 (13 years ago)

Author:

masberg

Message:

Remove unused imports. Use generics. Suppress warnings about one particular 'unused' variable, whose existence could be useful during debugging.

File:

• trunk/org.modelica.mdt.debug.ui/src/org/modelica/mdt/debug/ui/propertypages/ExceptionFilterEditor.java (modified) (10 diffs)

trunk/org.modelica.mdt.debug.ui/src/org/modelica/mdt/debug/ui/propertypages/ExceptionFilterEditor.java

@@ -59 +59 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
 import org.modelica.mdt.debug.core.IMDTFailureBreakpoint;
 import org.modelica.mdt.debug.ui.Filter;
@@ -75 +72 @@
     private Button fAddFilterButton;
     private Button fAddPackageButton;
+    @SuppressWarnings("unused")
     private Button fAddTypeButton;
     private Button fRemoveFilterButton;
@@ -170 +168 @@
 
     protected void doStore() {
-        Object[] filters = fFilterContentProvider.getElements(null);
-        List inclusionFilters = new ArrayList(filters.length);
-        List exclusionFilters = new ArrayList(filters.length);
-        for (int i = 0; i < filters.length; i++) {
-            Filter filter = (Filter) filters[i];
+        Filter[] filters = (Filter[])fFilterContentProvider.getElements(null);
+        List<String> inclusionFilters = new ArrayList<String>();
+        List<String> exclusionFilters = new ArrayList<String>();
+
+        for (Filter filter : filters) { 
             String name = filter.getName();
             if (name.equals(DEFAULT_PACKAGE)) {
@@ -181 +179 @@
             if (filter.isChecked()) {
                 inclusionFilters.add(name);
-            } else {
+            }
+            else {
                 exclusionFilters.add(name);
             }
@@ -188 +187 @@
             fBreakpoint.setInclusionFilters((String[]) inclusionFilters.toArray(new String[inclusionFilters.size()]));
             fBreakpoint.setExclusionFilters((String[]) exclusionFilters.toArray(new String[exclusionFilters.size()]));
-        } catch (CoreException ce) {
+        }
+        catch (CoreException ce) {
             ErrorManager.logError(ce);
         }
-
     }
 
@@ -404 +403 @@
     private void removeFilters() {
         IStructuredSelection selection = (IStructuredSelection) fFilterViewer.getSelection();
-        fFilterContentProvider.removeFilters(selection.toArray());
+        fFilterContentProvider.removeFilters((Filter[])selection.toArray());
     }
 
     private void removeNewFilter() {
-        fFilterContentProvider.removeFilters(new Object[] { fNewFilter });
+        fFilterContentProvider.removeFilters(new Filter[] { fNewFilter });
     }
 
@@ -444 +443 @@
 
         private CheckboxTableViewer fViewer;
-        private List fFilters;
+        private List<Filter> fFilters;
 
         public FilterContentProvider(CheckboxTableViewer viewer) {
@@ -464 +463 @@
                 };
             }
-            fFilters = new ArrayList();
+            fFilters = new ArrayList<Filter>();
             populateFilters(iFilters, true);
             populateFilters(eFilters, false);
@@ -490 +489 @@
         }
 
-        public void removeFilters(Object[] filters) {
-            for (int i = 0; i < filters.length; i++) {
-                Filter filter = (Filter) filters[i];
+        public void removeFilters(Filter[] filters) {
+            for (Filter filter : filters) {
                 fFilters.remove(filter);
             }
@@ -531 +529 @@
     /**
      */
-    public static ElementListSelectionDialog createAllPackagesDialog(Shell shell) 
-    {
-        final List filterList = new ArrayList();
+    public static ElementListSelectionDialog createAllPackagesDialog(Shell shell) {
+        final List<String> filterList = new ArrayList<String>();
         final boolean[] monitorCanceled = new boolean[] {false};
         IRunnableWithProgress r= new IRunnableWithProgress() {
             public void run(IProgressMonitor monitor) {
-                    Set filterNameSet= new HashSet();
+                    Set<String> filterNameSet= new HashSet<String>();
                     filterNameSet.add("*");                 
                     monitor.worked(1);