+ Added classes:
+ org.netbeans.spi.viewmodel.TreeExpansionModelFilter
+
+ Changed classes:
+ Models.TreeFeatures - final class with a private
+ constructor changed to an interface.
+
+ Added methods:
+ Models.createNodes(),
+
+ Added fields:
+ ModelEvent.EXPANSION_MASK
+
true if given node is expanded.
+ *
+ * @param node a node to be checked
+ * @return true if given node is expanded
+ */
+ public boolean isExpanded (
+ Object node
+ ) {
+ Node n = findNode (node);
+ if (n == null) return false; // Something what does not exist is not expanded ;-)
+ return view.isExpanded (n);
+ }
+
+ /**
+ * Expands given list of nodes.
+ *
+ * @param node a list of nodes to be expanded
+ */
+ public void expandNode (
+ Object node
+ ) {
+ Node n = findNode (node);
+ if (n != null)
+ view.expandNode (n);
+
+ }
+
+ /**
+ * Collapses given node.
+ *
+ * @param node a node to be expanded
+ */
+ public void collapseNode (
+ Object node
+ ) {
+ Node n = findNode (node);
+ if (n != null)
+ view.collapseNode (n);
+ }
+
+ /**
+ * Called whenever an item in the tree has been expanded.
+ */
+ public void treeExpanded (TreeExpansionEvent event) {
+ model.nodeExpanded (initExpandCollapseNotify(event));
+ }
+
+ /**
+ * Called whenever an item in the tree has been collapsed.
+ */
+ public void treeCollapsed (TreeExpansionEvent event) {
+ model.nodeCollapsed (initExpandCollapseNotify(event));
+ }
+
+ private Object initExpandCollapseNotify(TreeExpansionEvent event) {
+ Node node = Visualizer.findNode(event.getPath ().getLastPathComponent());
+ Object obj = node.getLookup().lookup(Object.class);
+ Object actOn;
+ node = node.getParentNode();
+ if (node == null) {
+ actOn = new Integer(0);
+ } else {
+ Children ch = node.getChildren();
+ if (ch instanceof TreeModelNode.TreeModelChildren) {
+ actOn = ((TreeModelNode.TreeModelChildren) ch).getTreeDepth();
+ } else {
+ actOn = ch;
+ }
+ }
+ DefaultTreeExpansionManager.get(model).setChildrenToActOn(actOn);
+ return obj;
+ }
+
+ }
+
}
diff -r 56bcd6cdfc36 spi.viewmodel/src/org/netbeans/modules/viewmodel/TreeTable.java
--- a/spi.viewmodel/src/org/netbeans/modules/viewmodel/TreeTable.java Thu May 29 16:35:41 2008 +0400
+++ b/spi.viewmodel/src/org/netbeans/modules/viewmodel/TreeTable.java Fri May 30 16:36:15 2008 +0200
@@ -100,7 +100,7 @@ import org.openide.windows.TopComponent;
* @author Jan Jancura
*/
public class TreeTable extends JPanel implements
-ExplorerManager.Provider, PropertyChangeListener, TreeExpansionListener {
+ExplorerManager.Provider, PropertyChangeListener {
private ExplorerManager explorerManager;
private MyTreeTable treeTable;
@@ -121,7 +121,6 @@ ExplorerManager.Provider, PropertyChange
treeTable.setHorizontalScrollBarPolicy
(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
add (treeTable, "Center"); //NOI18N
- treeTable.getTree ().addTreeExpansionListener (this);
ActionMap map = getActionMap();
ExplorerManager manager = getExplorerManager();
map.put(DefaultEditorKit.copyAction, ExplorerUtils.actionCopy(manager));
@@ -151,7 +150,7 @@ ExplorerManager.Provider, PropertyChange
// 4) set columns for given model
columns = createColumns (model);
- currentTreeModelRoot = new TreeModelRoot (model, this);
+ currentTreeModelRoot = new TreeModelRoot (model, treeTable);
TreeModelNode rootNode = currentTreeModelRoot.getRootNode ();
getExplorerManager ().setRootContext (rootNode);
// The root node must be ready when setting the columns
@@ -209,39 +208,6 @@ ExplorerManager.Provider, PropertyChange
if (propertyName.equals (ExplorerManager.PROP_SELECTED_NODES)) {
tc.setActivatedNodes ((Node[]) evt.getNewValue ());
}
- }
-
- /**
- * Called whenever an item in the tree has been expanded.
- */
- public void treeExpanded (TreeExpansionEvent event) {
- model.nodeExpanded (initExpandCollapseNotify(event));
- }
-
- /**
- * Called whenever an item in the tree has been collapsed.
- */
- public void treeCollapsed (TreeExpansionEvent event) {
- model.nodeCollapsed (initExpandCollapseNotify(event));
- }
-
- private Object initExpandCollapseNotify(TreeExpansionEvent event) {
- Node node = Visualizer.findNode(event.getPath ().getLastPathComponent());
- Object obj = node.getLookup().lookup(Object.class);
- Object actOn;
- node = node.getParentNode();
- if (node == null) {
- actOn = new Integer(0);
- } else {
- Children ch = node.getChildren();
- if (ch instanceof TreeModelNode.TreeModelChildren) {
- actOn = ((TreeModelNode.TreeModelChildren) ch).getTreeDepth();
- } else {
- actOn = ch;
- }
- }
- DefaultTreeExpansionManager.get(model).setChildrenToActOn(actOn);
- return obj;
}
private boolean equalNodes () {
diff -r 56bcd6cdfc36 spi.viewmodel/src/org/netbeans/spi/viewmodel/ModelEvent.java
--- a/spi.viewmodel/src/org/netbeans/spi/viewmodel/ModelEvent.java Thu May 29 16:35:41 2008 +0400
+++ b/spi.viewmodel/src/org/netbeans/spi/viewmodel/ModelEvent.java Fri May 30 16:36:15 2008 +0200
@@ -156,6 +156,11 @@ public class ModelEvent extends EventObj
* @since 1.6
*/
public static final int CHILDREN_MASK = 8;
+ /**
+ * The mask for expansion change.
+ * @since 1.15
+ */
+ public static final int EXPANSION_MASK = 16;
private Object node;
private int change;
diff -r 56bcd6cdfc36 spi.viewmodel/src/org/netbeans/spi/viewmodel/Models.java
--- a/spi.viewmodel/src/org/netbeans/spi/viewmodel/Models.java Thu May 29 16:35:41 2008 +0400
+++ b/spi.viewmodel/src/org/netbeans/spi/viewmodel/Models.java Fri May 30 16:36:15 2008 +0200
@@ -65,6 +65,7 @@ import javax.swing.SwingUtilities;
import javax.swing.SwingUtilities;
import org.netbeans.modules.viewmodel.DefaultTreeExpansionManager;
+import org.netbeans.modules.viewmodel.TreeModelRoot;
import org.netbeans.modules.viewmodel.TreeTable;
import org.netbeans.spi.viewmodel.ColumnModel;
@@ -82,6 +83,7 @@ import org.netbeans.spi.viewmodel.Unknow
import org.netbeans.spi.viewmodel.UnknownTypeException;
import org.openide.ErrorManager;
+import org.openide.explorer.view.TreeView;
import org.openide.nodes.Node;
import org.openide.util.Exceptions;
import org.openide.util.WeakSet;
@@ -127,6 +129,23 @@ public final class Models {
TreeTable tt = new TreeTable ();
tt.setModel (compoundModel);
return tt;
+ }
+
+ /**
+ * Creates a root node of the nodes tree structure
+ * for given {@link org.netbeans.spi.viewmodel.Models.CompoundModel}.
+ *
+ * @param compoundModel a compound model instance
+ * @param treeView The tree view component where nodes are going to be displayed.
+ *
+ * @return new instance root node
+ * @since 1.15
+ */
+ public static Node createNodes (
+ CompoundModel compoundModel,
+ TreeView treeView
+ ) {
+ return new TreeModelRoot (compoundModel, treeView).getRootNode();
}
/**
@@ -184,6 +203,7 @@ public final class Models {
Listtrue if given node is expanded.
+ *
+ * @param node a node to be checked
+ * @return true if given node is expanded
+ */
+ public boolean isExpanded (Object node);
+
+ /**
+ * Expands given list of nodes.
+ *
+ * @param node a list of nodes to be expanded
+ */
+ public void expandNode (Object node);
+
+ /**
+ * Collapses given node.
+ *
+ * @param node a node to be expanded
+ */
+ public void collapseNode (Object node);
+
+ }
+
+ /**
* Implements set of tree view features.
*/
- public static final class TreeFeatures {
+ private static final class DefaultTreeFeatures implements TreeFeatures {
private JComponent view;
- private TreeFeatures (JComponent view) {
+ private DefaultTreeFeatures (JComponent view) {
this.view = view;
}
@@ -3020,6 +3158,9 @@ public final class Models {
if (tableModel != treeModel && tableModel != nodeModel) {
tableModel.addModelListener (l);
}
+ if (treeExpansionModel instanceof CompoundTreeExpansionModel) {
+ ((CompoundTreeExpansionModel) treeExpansionModel).addModelListener(l);
+ }
}
/**
@@ -3034,6 +3175,9 @@ public final class Models {
}
if (tableModel != treeModel && tableModel != nodeModel) {
tableModel.removeModelListener (l);
+ }
+ if (treeExpansionModel instanceof CompoundTreeExpansionModel) {
+ ((CompoundTreeExpansionModel) treeExpansionModel).removeModelListener(l);
}
}
diff -r 56bcd6cdfc36 spi.viewmodel/src/org/netbeans/spi/viewmodel/TreeExpansionModelFilter.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/spi.viewmodel/src/org/netbeans/spi/viewmodel/TreeExpansionModelFilter.java Fri May 30 16:36:15 2008 +0200
@@ -0,0 +1,91 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+
+package org.netbeans.spi.viewmodel;
+
+
+/**
+ * This model filter controlls expansion, collapsion of nodes in tree view, and
+ * defindes default expand state for all node in it. It may delegate to the supplied
+ * TreeExpansionModel.
+ *
+ * @author Martin Entlicher
+ * @since 1.15
+ */
+public interface TreeExpansionModelFilter extends Model {
+
+ /**
+ * Defines default state (collapsed, expanded) of given node.
+ *
+ * @param node a node
+ * @return default state (collapsed, expanded) of given node
+ */
+ public abstract boolean isExpanded (TreeExpansionModel original, Object node)
+ throws UnknownTypeException;
+
+ /**
+ * Called when given node is expanded.
+ *
+ * @param node a expanded node
+ */
+ public abstract void nodeExpanded (Object node);
+
+ /**
+ * Called when given node is collapsed.
+ *
+ * @param node a collapsed node
+ */
+ public abstract void nodeCollapsed (Object node);
+
+ /**
+ * Registers given listener.
+ *
+ * @param l the listener to add
+ */
+ public abstract void addModelListener (ModelListener l);
+
+ /**
+ * Unregisters given listener.
+ *
+ * @param l the listener to remove
+ */
+ public abstract void removeModelListener (ModelListener l);
+}