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

Timestamp:

11/22/11 21:40:26 (13 years ago)

Author:

masberg

Message:

Begin introduction of generics

File:

• trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/text/ModelicaFoldingStructureProvider.java (modified) (5 diffs)

trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/text/ModelicaFoldingStructureProvider.java

@@ -80 +80 @@
 
         private boolean fHasModelicaDocComment;
-        private LinkedHashMap fMap= new LinkedHashMap();
+        private Map<ModelicaProjectionAnnotation, Position> fMap= new LinkedHashMap<ModelicaProjectionAnnotation, Position>();
 
         private FoldingStructureComputationContext(IDocument document, ProjectionAnnotationModel model, boolean allowCollapsing) {
@@ -284 +284 @@
      */
     private static final class ModelicaElementSetFilter implements Filter {
-        private final Set fSet;
+        private final Set<IModelicaElement> fSet;
         private final boolean fMatchCollapsed;
 
-        private ModelicaElementSetFilter(Set set, boolean matchCollapsed) {
+        private ModelicaElementSetFilter(Set<IModelicaElement> set, boolean matchCollapsed) {
             fSet= set;
             fMatchCollapsed= matchCollapsed;
@@ -744 +744 @@
 
         computeFoldingStructure(ctx);
-        Map newStructure= ctx.fMap;
+        Map<ModelicaProjectionAnnotation, Position> newStructure= ctx.fMap;
         Map oldStructure= computeCurrentStructure(ctx);
 
@@ -1233 +1233 @@
      */
     public final void collapseElements(IModelicaElement[] elements) {
-        Set set= new HashSet(Arrays.asList(elements));
+        Set<IModelicaElement> set= new HashSet<IModelicaElement>(Arrays.asList(elements));
         modifyFiltered(new ModelicaElementSetFilter(set, false), false);
     }
@@ -1241 +1241 @@
      */
     public final void expandElements(IModelicaElement[] elements) {
-        Set set= new HashSet(Arrays.asList(elements));
+        Set<IModelicaElement> set= new HashSet<IModelicaElement>(Arrays.asList(elements));
         modifyFiltered(new ModelicaElementSetFilter(set, true), true);
     }