reenabled folding preference for inner types

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / text / folding / DefaultJavaFoldingStructureProvider.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/folding/DefaultJavaFoldingStructureProvider.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/folding/DefaultJavaFoldingStructureProvider.java
index 48be71c..c06a287 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/folding/DefaultJavaFoldingStructureProvider.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/folding/DefaultJavaFoldingStructureProvider.java
@@ -560,7 +560,13 @@ public class DefaultJavaFoldingStructureProvider implements IProjectionListener,
                // createProjection = true;
                // break;
                case IJavaElement.TYPE:
-                       collapse = fAllowCollapsing && fCollapseInnerTypes && isInnerType((IType) element);
+                       collapse = fAllowCollapsing;
+                       if (isInnerType((IType) element)) {
+                               collapse = collapse && fCollapseInnerTypes;
+                       }
+                       else {
+                               collapse = false; //don't allow the most outer type to be folded, may be changed in future versions
+                       }
                        createProjection = true;
                        break;
                case IJavaElement.METHOD: