Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 77104 invoked from network); 2 Feb 2010 14:37:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Feb 2010 14:37:34 -0000 Received: (qmail 97735 invoked by uid 500); 2 Feb 2010 14:37:34 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 97713 invoked by uid 500); 2 Feb 2010 14:37:34 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 97704 invoked by uid 99); 2 Feb 2010 14:37:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2010 14:37:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2010 14:37:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D6D7E23888EC; Tue, 2 Feb 2010 14:37:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r905649 - /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java Date: Tue, 02 Feb 2010 14:37:12 -0000 To: commits@cayenne.apache.org From: oltka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100202143712.D6D7E23888EC@eris.apache.org> Author: oltka Date: Tue Feb 2 14:37:12 2010 New Revision: 905649 URL: http://svn.apache.org/viewvc?rev=905649&view=rev Log: CAY-1339 Remove org.apache.cayenne.project package from runtime * remove TraversalHelper Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java?rev=905649&r1=905648&r2=905649&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java (original) +++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java Tue Feb 2 14:37:12 2010 @@ -21,19 +21,10 @@ import java.util.Comparator; import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.MutableTreeNode; - -import org.apache.cayenne.configuration.DataChannelDescriptor; -import org.apache.cayenne.configuration.DataNodeDescriptor; -import org.apache.cayenne.map.DataMap; -import org.apache.cayenne.project.ProjectPath; -import org.apache.cayenne.project.ProjectTraversal; -import org.apache.cayenne.project.ProjectTraversalHandler; import org.apache.cayenne.project2.Project; /** @@ -41,18 +32,7 @@ */ public class ProjectTreeModel extends DefaultTreeModel { - /** - * Creates a tree of Swing TreeNodes wrapping Cayenne project object. Returns the root - * node of the tree. - * - * @deprecated since 3.1 use {@link ProjectTreeFactory}. - */ - public static DefaultMutableTreeNode wrapProjectNode(Object node) { - TraversalHelper helper = new TraversalHelper(); - new ProjectTraversal(helper, true).traverse(node); - return helper.getStartNode(); - } - + /** * Constructor for ProjectTreeModel. */ @@ -171,54 +151,4 @@ return currentNode; } - - static class TraversalHelper implements ProjectTraversalHandler { - - protected DefaultMutableTreeNode startNode; - protected Map nodesMap; - - public TraversalHelper() { - this.nodesMap = new HashMap(); - } - - public DefaultMutableTreeNode getStartNode() { - return startNode; - } - - public void registerNode(DefaultMutableTreeNode node) { - nodesMap.put(node.getUserObject(), node); - } - - public void projectNode(ProjectPath nodePath) { - - Object parent = nodePath.getObjectParent(); - Object object = nodePath.getObject(); - DefaultMutableTreeNode node = new DefaultMutableTreeNode(object); - - if (startNode == null) { - startNode = node; - } - else { - DefaultMutableTreeNode nodeParent = nodesMap.get(parent); - nodeParent.add(node); - } - - registerNode(node); - } - - public boolean shouldReadChildren(Object node, ProjectPath parentPath) { - // do not read deatils of linked maps - if ((node instanceof DataMap) - && parentPath != null - && (parentPath.getObject() instanceof DataNodeDescriptor)) { - return false; - } - - return (node instanceof Project) - || (node instanceof DataChannelDescriptor) - || (node instanceof DataMap) - || (node instanceof DataNodeDescriptor); - } - } - }