Author: vyemialyanchyk Date: 2008-01-21 13:19:26 -0500 (Mon, 21 Jan 2008) New Revision: 5852 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java Log: http://jira.jboss.com/jira/browse/JBIDE-1422 roll back Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 2008-01-21 17:49:30 UTC (rev 5851) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 2008-01-21 18:19:26 UTC (rev 5852) @@ -64,9 +64,6 @@ */ public class KnownConfigurations { - // flag broadcast updates to all listeners - true by default - // for prevent broadcasting set this flag into false - private boolean broadcastFlag = true; // TODO: is the best way for the querypage model ? private QueryPageModel queryPages = new QueryPageModel(); private List configurationListeners = new ArrayList(); @@ -141,7 +138,7 @@ * Add the repository to the receiver's list of known configurations. Doing this will enable * */ - public ConsoleConfiguration addConfiguration(final ConsoleConfiguration configuration) { + public ConsoleConfiguration addConfiguration(final ConsoleConfiguration configuration, boolean broadcast) { // Check the cache for an equivalent instance and if there is one, just update the cache ConsoleConfiguration existingConfiguration = internalGetRepository(configuration.getName() ); if (existingConfiguration == null) { @@ -153,7 +150,7 @@ existingConfiguration = configuration; } - if (broadcastFlag) { + if (broadcast) { fireNotification(new Notification() { public void notify(KnownConfigurationsListener listener) { listener.configurationAdded(configuration); @@ -167,24 +164,22 @@ ConsoleConfiguration[] cfgs = getConfigurations(); for (int i = 0; i < cfgs.length; i++) { ConsoleConfiguration configuration = cfgs[i]; - removeConfiguration(configuration); + removeConfiguration(configuration, false); } } // added forUpdate as a workaround for letting listeners know it is done to update the configuration so they don't cause removal issues. - public void removeConfiguration(final ConsoleConfiguration configuration) { + public void removeConfiguration(final ConsoleConfiguration configuration, final boolean forUpdate) { ConsoleConfiguration oldConfig = (ConsoleConfiguration) getRepositoriesMap().remove(configuration.getName() ); if (oldConfig != null) { oldConfig.removeConsoleConfigurationListener(sfListener); - if (broadcastFlag) { - fireNotification(new Notification() { - public void notify(KnownConfigurationsListener listener) { - listener.configurationRemoved(configuration); - } - }); - } + fireNotification(new Notification() { + public void notify(KnownConfigurationsListener listener) { + listener.configurationRemoved(configuration, forUpdate); + } + }); oldConfig.reset(); removeLoggingStream( oldConfig ); @@ -352,19 +347,5 @@ return queryParameters; } - public boolean getBroadcast() { - return this.broadcastFlag; - } - public void setBroadcast(boolean broadcastFlag) { - this.broadcastFlag = broadcastFlag; - if (broadcastFlag) { - fireNotification(new Notification() { - public void notify(KnownConfigurationsListener listener) { - listener.configurationRefreshAll(); - } - }); - } - } - } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java 2008-01-21 17:49:30 UTC (rev 5851) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java 2008-01-21 18:19:26 UTC (rev 5852) @@ -31,7 +31,5 @@ public void sessionFactoryClosing(ConsoleConfiguration configuration, SessionFactory closingFactory); - public void configurationRemoved(ConsoleConfiguration root); - - public void configurationRefreshAll(); + public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate); } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java 2008-01-21 17:49:30 UTC (rev 5851) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java 2008-01-21 18:19:26 UTC (rev 5852) @@ -52,14 +52,10 @@ childrenCreated=false; } - public void configurationRemoved(ConsoleConfiguration root) { + public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate) { markChildrenForReload(); } - public void configurationRefreshAll() { - markChildrenForReload(); - } - public void sessionFactoryClosing(ConsoleConfiguration configuration, SessionFactory closingFactory) { }