Author: vyemialyanchyk Date: 2008-01-18 11:20:52 -0500 (Fri, 18 Jan 2008) New Revision: 5810 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactory.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactoryAdapter.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java Log: http://jira.jboss.org/jira/browse/JBIDE-1422 rool back Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java 2008-01-18 16:20:15 UTC (rev 5809) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java 2008-01-18 16:20:52 UTC (rev 5810) @@ -75,9 +75,7 @@ o2 = sfError; }*/ - Object[] res = new Object[] { o1, new LazySessionFactory(ccfg), new LazyDatabaseSchema(ccfg) }; - ccfg.setChildren(res); - return res; + return new Object[] { o1, new LazySessionFactory(ccfg), new LazyDatabaseSchema(ccfg) }; } private ConsoleConfiguration getConsoleConfiguration(Object o) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java 2008-01-18 16:20:15 UTC (rev 5809) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java 2008-01-18 16:20:52 UTC (rev 5810) @@ -29,7 +29,6 @@ import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.progress.DeferredTreeContentManager; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; -import org.hibernate.console.model.IParentEl; public class DeferredContentProvider extends BaseWorkbenchContentProvider { @@ -56,10 +55,6 @@ * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ public boolean hasChildren(Object element) { - // if we could check simple check it without DeferredTreeContentManager - if (element instanceof IParentEl) { - return ((IParentEl)element).hasChildren(); - } // the + box will always appear, but then disappear // if not needed after you first click on it. if (manager != null) { @@ -74,13 +69,6 @@ * @see org.eclipse.ui.model.WorkbenchContentProvider#getChildren(java.lang.Object) */ public Object[] getChildren(Object element) { - // if we could get children simple get it without DeferredTreeContentManager - if (element instanceof IParentEl) { - Object[] children = ((IParentEl)element).getChildren(); - if (null != children) { - return children; - } - } if (manager != null) { Object[] children = manager.getChildren(element); if(children != null) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java 2008-01-18 16:20:15 UTC (rev 5809) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java 2008-01-18 16:20:52 UTC (rev 5810) @@ -24,9 +24,8 @@ import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy; import org.hibernate.cfg.reveng.ReverseEngineeringStrategy; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.model.IParentElImpl; -public class LazyDatabaseSchema extends IParentElImpl { +public class LazyDatabaseSchema { private final ConsoleConfiguration ccfg; private final ReverseEngineeringStrategy res; @@ -46,4 +45,5 @@ public ReverseEngineeringStrategy getReverseEngineeringStrategy() { return res; } + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2008-01-18 16:20:15 UTC (rev 5809) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2008-01-18 16:20:52 UTC (rev 5810) @@ -64,7 +64,7 @@ Map.Entry entry = (Map.Entry) qualifierEntries.next(); result.add(new TableContainer((String) entry.getKey(),(List)entry.getValue())); } - Object[] res = toArray(result.iterator(), TableContainer.class, new Comparator() { + return toArray(result.iterator(), TableContainer.class, new Comparator() { public int compare(Object arg0, Object arg1) { @@ -72,8 +72,6 @@ } }); - dbs.setChildren(res); - return res; } private LazyDatabaseSchema getLazyDatabaseSchema(Object o) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactory.java 2008-01-18 16:20:15 UTC (rev 5809) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactory.java 2008-01-18 16:20:52 UTC (rev 5810) @@ -22,10 +22,9 @@ package org.hibernate.eclipse.console.workbench; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.model.IParentElImpl; import org.hibernate.console.node.ConfigurationEntitiesNode; -public class LazySessionFactory extends IParentElImpl { +public class LazySessionFactory { private final ConsoleConfiguration ccfg; private ConfigurationEntitiesNode cfgNode; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactoryAdapter.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactoryAdapter.java 2008-01-18 16:20:15 UTC (rev 5809) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactoryAdapter.java 2008-01-18 16:20:52 UTC (rev 5810) @@ -50,9 +50,7 @@ } } if(lazySessionFactory.getCfgNode()!=null) { - Object[] res = toArray(lazySessionFactory.getCfgNode().children(),BaseNode.class); - lazySessionFactory.setChildren(res); - return res; + return toArray(lazySessionFactory.getCfgNode().children(),BaseNode.class); } else { return new Object[] { label }; } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2008-01-18 16:20:15 UTC (rev 5809) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2008-01-18 16:20:52 UTC (rev 5810) @@ -23,10 +23,8 @@ import java.util.List; -import org.hibernate.console.model.IParentElImpl; +public class TableContainer { -public class TableContainer extends IParentElImpl { - private final List tables; private final String name; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2008-01-18 16:20:15 UTC (rev 5809) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2008-01-18 16:20:52 UTC (rev 5810) @@ -32,7 +32,7 @@ public Object[] getChildren(Object o) { TableContainer tc = getTableContainer( o ); - Object[] res = toArray(tc.getTables().iterator(), Table.class, new Comparator() { + return toArray(tc.getTables().iterator(), Table.class, new Comparator() { public int compare(Object arg0, Object arg1) { @@ -40,8 +40,6 @@ } }); - tc.setChildren(res); - return res; } private TableContainer getTableContainer(Object o) {