Changeset 641

Timestamp:

08/17/07 13:26:40 (1 year ago)

Author:

asterite

Message:

Folding options more specific (still they need to be more specific).

Files:

• trunk/descent.ui/src/descent/internal/ui/text/folding/DefaultJavaFoldingPreferenceBlock.java (modified) (2 diffs)
• trunk/descent.ui/src/descent/internal/ui/text/folding/FoldingMessages.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/folding/FoldingMessages.properties (modified) (1 diff)
• trunk/descent.ui/src/descent/ui/PreferenceConstants.java (modified) (4 diffs)
• trunk/descent.ui/src/descent/ui/text/folding/DefaultJavaFoldingStructureProvider.java (modified) (7 diffs)

trunk/descent.ui/src/descent/internal/ui/text/folding/DefaultJavaFoldingPreferenceBlock.java

@@ -66 +66 @@
-        ArrayList overlayKeys= new ArrayList();
-
-JAVA
-INNER
+D
+
-        overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_METHODS));
-        overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_IMPORTS));
-        overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_HEADERS));
+        overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_VERSION_DEBUG));
+        overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_INVARIANTS));
+        overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_UNITTESTS));
-
-        return (OverlayKey[]) overlayKeys.toArray(new OverlayKey[overlayKeys.size()]);
@@ -91 +94 @@
-        label.setText(FoldingMessages.DefaultJavaFoldingPreferenceBlock_title);
-
-JAVA
+D
-        addCheckBox(inner, FoldingMessages.DefaultJavaFoldingPreferenceBlock_headers, PreferenceConstants.EDITOR_FOLDING_HEADERS, 0);
-INNER
+
-        addCheckBox(inner, FoldingMessages.DefaultJavaFoldingPreferenceBlock_methods, PreferenceConstants.EDITOR_FOLDING_METHODS, 0);
+        addCheckBox(inner, FoldingMessages.DefaultJavaFoldingPreferenceBlock_version_debug, PreferenceConstants.EDITOR_FOLDING_VERSION_DEBUG, 0);
+        addCheckBox(inner, FoldingMessages.DefaultJavaFoldingPreferenceBlock_invariants, PreferenceConstants.EDITOR_FOLDING_INVARIANTS, 0);
+        addCheckBox(inner, FoldingMessages.DefaultJavaFoldingPreferenceBlock_unittests, PreferenceConstants.EDITOR_FOLDING_UNITTESTS, 0);
-        addCheckBox(inner, FoldingMessages.DefaultJavaFoldingPreferenceBlock_imports, PreferenceConstants.EDITOR_FOLDING_IMPORTS, 0);
-

trunk/descent.ui/src/descent/internal/ui/text/folding/FoldingMessages.java

@@ -30 +30 @@
-    public static String DefaultJavaFoldingPreferenceBlock_imports;
-    public static String DefaultJavaFoldingPreferenceBlock_headers;
+    public static String DefaultJavaFoldingPreferenceBlock_version_debug;
+    public static String DefaultJavaFoldingPreferenceBlock_invariants;
+    public static String DefaultJavaFoldingPreferenceBlock_unittests;
-    public static String EmptyJavaFoldingPreferenceBlock_emptyCaption;
-    public static String JavaFoldingStructureProviderRegistry_warning_providerNotFound_resetToDefault;

trunk/descent.ui/src/descent/internal/ui/text/folding/FoldingMessages.properties

@@ -13 +13 @@
-DefaultJavaFoldingPreferenceBlock_title= Initially fold these elements:
-DefaultJavaFoldingPreferenceBlock_comments= &Comments
-Inner &t
+&T
-DefaultJavaFoldingPreferenceBlock_methods= &Members
+DefaultJavaFoldingPreferenceBlock_version_debug= &Version/Debug declarations
+DefaultJavaFoldingPreferenceBlock_invariants= &Invariants
+DefaultJavaFoldingPreferenceBlock_unittests= &Unit tests
-DefaultJavaFoldingPreferenceBlock_imports= &Imports
-DefaultJavaFoldingPreferenceBlock_headers= &Module Comments

trunk/descent.ui/src/descent/ui/PreferenceConstants.java

@@ -3262 +3262 @@
-    
-    /**
-Java
-
-
-
-
-
-
-JAVA
-
-
-inner 
-
-
-
-
-
-
-INNER
+D
+
+
+
+
+
+
+D
+
+
+
+
+
+
+
+
+
+
-
-    /**
@@ -3300 +3300 @@
-     */
-    public static final String EDITOR_FOLDING_IMPORTS= "editor_folding_default_imports"; //$NON-NLS-1$
-
+
-    /**
-     * A named preference that stores the value for header comment folding for the default folding provider.
@@ -3310 +3310 @@
-     */
-    public static final String EDITOR_FOLDING_HEADERS= "editor_folding_default_headers"; //$NON-NLS-1$
+    
+    /**
+     * A named preference that stores the value for version/debug folding for the default folding provider.
+     * <p>
+     * Value is of type <code>Boolean</code>.
+     * </p>
+     * 
+     * @since 3.0
+     */
+    public static final String EDITOR_FOLDING_VERSION_DEBUG= "editor_folding_default_version_debug"; //$NON-NLS-1$
+    
+    /**
+     * A named preference that stores the value for invariant folding for the default folding provider.
+     * <p>
+     * Value is of type <code>Boolean</code>.
+     * </p>
+     * 
+     * @since 3.0
+     */
+    public static final String EDITOR_FOLDING_INVARIANTS= "editor_folding_default_invariants"; //$NON-NLS-1$
+    
+    /**
+     * A named preference that stores the value for unittest folding for the default folding provider.
+     * <p>
+     * Value is of type <code>Boolean</code>.
+     * </p>
+     * 
+     * @since 3.0
+     */
+    public static final String EDITOR_FOLDING_UNITTESTS= "editor_folding_default_unittest"; //$NON-NLS-1$
-
-
@@ -3866 +3896 @@
-        store.setDefault(PreferenceConstants.EDITOR_FOLDING_ENABLED, true);
-        store.setDefault(PreferenceConstants.EDITOR_FOLDING_PROVIDER, "descent.ui.text.defaultFoldingProvider"); //$NON-NLS-1$
-JAVA
-INNER
+D
+
-        store.setDefault(PreferenceConstants.EDITOR_FOLDING_METHODS, false);
-        store.setDefault(PreferenceConstants.EDITOR_FOLDING_IMPORTS, true);

trunk/descent.ui/src/descent/ui/text/folding/DefaultJavaFoldingStructureProvider.java

@@ -44 +44 @@
-import descent.core.ICompilationUnit;
-import descent.core.IElementChangedListener;
+import descent.core.IInitializer;
-import descent.core.IJavaElement;
-import descent.core.IJavaElementDelta;
-import descent.core.IMember;
+import descent.core.IMethod;
-import descent.core.IParent;
-import descent.core.ISourceRange;
@@ -182 +184 @@
-         * @return <code>true</code> if inner types should be collapsed
-         */
-Inner
-Inner
+
+
-        }
-
@@ -192 +194 @@
-         */
-        public boolean collapseJavadoc() {
-Java
+D
-        }
-
@@ -202 +204 @@
-        public boolean collapseMembers() {
-            return fAllowCollapsing && fCollapseMembers;
+        }
+        
+        /**
+         * Returns <code>true</code> if debug/version should be collapsed.
+         * 
+         * @return <code>true</code> if debug/version should be collapsed
+         */
+        public boolean collapseVersionDebug() {
+            return fAllowCollapsing && fCollapseVersionDebug;
+        }
+        
+        /**
+         * Returns <code>true</code> if invariants should be collapsed.
+         * 
+         * @return <code>true</code> if invariants should be collapsed
+         */
+        public boolean collapseInvariants() {
+            return fAllowCollapsing && fCollapseInvariants;
+        }
+        
+        /**
+         * Returns <code>true</code> if unittests should be collapsed.
+         * 
+         * @return <code>true</code> if unittests should be collapsed
+         */
+        public boolean collapseUnittests() {
+            return fAllowCollapsing && fCollapseUnittests;
-        }
-    }
@@ -612 +641 @@
-
-    /* preferences */
-Java
+D
-    private boolean fCollapseImportContainer= true;
-Inner
+
-    private boolean fCollapseMembers= false;
-    private boolean fCollapseHeaderComments= true;
+    private boolean fCollapseVersionDebug= true;
+    private boolean fCollapseInvariants= true;
+    private boolean fCollapseUnittests= true;
-
-    /* filters */
@@ -765 +797 @@
-    private void initializePreferences() {
-        IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
-InnerTypes= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_INNER
+Types= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_
-        fCollapseImportContainer= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_IMPORTS);
-Javadoc= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_JAVA
+Ddoc= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_D
-        fCollapseMembers= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_METHODS);
-        fCollapseHeaderComments= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_HEADERS);
+        fCollapseVersionDebug= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_VERSION_DEBUG);
+        fCollapseInvariants= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_INVARIANTS);
+        fCollapseUnittests= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_UNITTESTS);
-    }
-
@@ -905 +940 @@
-            case IJavaElement.TYPE:
-                // Changed to not only collapse inner types
-/*isInnerType((IType) element) && */ 
-Inner
+
+
-                break;
-            case IJavaElement.METHOD:
-            case IJavaElement.FIELD:
+                collapse= ctx.collapseMembers();
+                break;
-            case IJavaElement.INITIALIZER:
-
+
+
+
+
+
+
+
+
+
+
+
+
-                break;
-            default: