JBoss Tools SVN: r4597 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-31 12:04:44 -0400 (Wed, 31 Oct 2007)
New Revision: 4597
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java
Log:
JBIDE-1234
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java 2007-10-31 15:13:06 UTC (rev 4596)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebDirProjectContext.java 2007-10-31 16:04:44 UTC (rev 4597)
@@ -23,6 +23,7 @@
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
+import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
public abstract class ImportWebDirProjectContext extends ImportWebProjectContext {
public static final String PAGE_NAME = "WebPrjAdoptStepName"; //$NON-NLS-1$
@@ -96,6 +97,12 @@
modules = createAdoptContext().createModulesInfo(webxml, webInfFile);
createAllModules();
setProjectJavaSrc();
+ if(webxml != null) {
+ String sv = WebAppHelper.getServletVersion(webxml);
+ if(sv != null && sv.length() > 0) {
+ setServletVersion(sv);
+ }
+ }
}
protected void setProjectJavaSrc() {
17 years, 2 months
JBoss Tools SVN: r4596 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 11:13:06 -0400 (Wed, 31 Oct 2007)
New Revision: 4596
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
Log:
JBIDE-1095 - removed deprecated oracle dialects.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 15:10:18 UTC (rev 4595)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 15:13:06 UTC (rev 4596)
@@ -59,9 +59,9 @@
dialectNames.put("MySQL (MyISAM)", "org.hibernate.dialect.MySQLMyISAMDialect");
dialectNames.put("MySQL 5", "org.hibernate.dialect.MySQL5Dialect");
dialectNames.put("MySQL 5 (InnoDB)", "org.hibernate.dialect.MySQL5InnoDBDialect");
- dialectNames.put("Oracle","org.hibernate.dialect.OracleDialect");
+ //dialectNames.put("Oracle","org.hibernate.dialect.OracleDialect");
dialectNames.put("Oracle 8i","org.hibernate.dialect.Oracle8iDialect");
- dialectNames.put("Oracle 9", "org.hibernate.dialect.Oracle9Dialect");
+ //dialectNames.put("Oracle 9", "org.hibernate.dialect.Oracle9Dialect");
dialectNames.put("Oracle 9i", "org.hibernate.dialect.Oracle9iDialect");
dialectNames.put("Oracle 10g", "org.hibernate.dialect.Oracle10gDialect");
dialectNames.put("Pointbase", "org.hibernate.dialect.PointbaseDialect");
17 years, 2 months
JBoss Tools SVN: r4595 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 11:10:18 -0400 (Wed, 31 Oct 2007)
New Revision: 4595
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
Log:
JBIDE-1095
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 14:59:11 UTC (rev 4594)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 15:10:18 UTC (rev 4595)
@@ -62,6 +62,7 @@
dialectNames.put("Oracle","org.hibernate.dialect.OracleDialect");
dialectNames.put("Oracle 8i","org.hibernate.dialect.Oracle8iDialect");
dialectNames.put("Oracle 9", "org.hibernate.dialect.Oracle9Dialect");
+ dialectNames.put("Oracle 9i", "org.hibernate.dialect.Oracle9iDialect");
dialectNames.put("Oracle 10g", "org.hibernate.dialect.Oracle10gDialect");
dialectNames.put("Pointbase", "org.hibernate.dialect.PointbaseDialect");
dialectNames.put("PostgreSQL", "org.hibernate.dialect.PostgreSQLDialect");
17 years, 2 months
JBoss Tools SVN: r4594 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console: actions and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 10:59:11 -0400 (Wed, 31 Oct 2007)
New Revision: 4594
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ConfigurationCombo.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsProvider.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java
Log:
HBX-955, JBIDE-575 Restore default entries fails on new configuration
+ removed superflous excpetion logging in case of updating the configuration.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ConfigurationCombo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ConfigurationCombo.java 2007-10-31 13:53:49 UTC (rev 4593)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ConfigurationCombo.java 2007-10-31 14:59:11 UTC (rev 4594)
@@ -49,7 +49,7 @@
SessionFactory builtFactory) {
}
- public void configurationRemoved(ConsoleConfiguration root) {
+ public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate) {
populateComboBox();
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2007-10-31 13:53:49 UTC (rev 4593)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2007-10-31 14:59:11 UTC (rev 4594)
@@ -135,11 +135,13 @@
}
- public void configurationRemoved(ConsoleConfiguration root) {
+ public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate) {
try {
removeConfiguration(root.getName());
} catch (CoreException e) {
- logErrorMessage("Could not delete launch configuration for: " + root.getName(), e);
+ if(!forUpdate) {
+ logErrorMessage("Could not delete launch configuration for: " + root.getName(), e);
+ }
}
}
@@ -169,7 +171,7 @@
public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
ConsoleConfiguration cfg = KnownConfigurations.getInstance().find( configuration.getName() );
if(cfg!=null) {
- KnownConfigurations.getInstance().removeConfiguration( cfg );
+ KnownConfigurations.getInstance().removeConfiguration( cfg, false );
}
}
@@ -182,8 +184,9 @@
ConsoleConfiguration oldcfg = instance.find( configuration.getName() );
if(oldcfg!=null) {
oldcfg.reset(); // reset it no matter what.
- instance.removeConfiguration(oldcfg);
+ instance.removeConfiguration(oldcfg, true);
+
ConsoleConfigurationPreferences adapter = buildConfigurationPreferences(configuration);
instance.addConfiguration(new ConsoleConfiguration(adapter), true);
}
@@ -203,7 +206,7 @@
ConsoleConfiguration oldcfg = instance.find( movedFrom.getName() );
if(oldcfg!=null) {
oldcfg.reset(); // reset it no matter what.
- instance.removeConfiguration(oldcfg);
+ instance.removeConfiguration(oldcfg, false);
}
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java 2007-10-31 13:53:49 UTC (rev 4593)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java 2007-10-31 14:59:11 UTC (rev 4594)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationType;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
@@ -71,10 +72,11 @@
String launchName = launchManager.generateUniqueLaunchConfigurationNameFrom("hibernate");
//ILaunchConfiguration[] launchConfigurations = launchManager.getLaunchConfigurations( launchConfigurationType );
ILaunchConfigurationWorkingCopy wc = launchConfigurationType.newInstance(null, launchName);
- int i = DebugUITools.openLaunchConfigurationPropertiesDialog( part.getSite().getShell(), wc, "org.eclipse.debug.ui.launchGroup.run" );
- if(i==Window.OK) {
- wc.doSave();
- }
+ ILaunchConfiguration saved = wc.doSave();
+ int i = DebugUITools.openLaunchConfigurationPropertiesDialog( part.getSite().getShell(), saved, "org.eclipse.debug.ui.launchGroup.run" );
+ if(i!=Window.OK) {
+ saved.delete();
+ }
} catch (CoreException ce) {
HibernateConsolePlugin.getDefault().showError( part.getSite().getShell(), "Problem adding a console configuration", ce);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2007-10-31 13:53:49 UTC (rev 4593)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2007-10-31 14:59:11 UTC (rev 4594)
@@ -46,7 +46,7 @@
Iterator iter = selectedNonResources.iterator();
while (iter.hasNext() ) {
ConsoleConfiguration element = (ConsoleConfiguration) iter.next();
- KnownConfigurations.getInstance().removeConfiguration(element);
+ KnownConfigurations.getInstance().removeConfiguration(element, false);
}
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 13:53:49 UTC (rev 4593)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 14:59:11 UTC (rev 4594)
@@ -29,6 +29,8 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.core.runtime.IPath;
+
/**
* @author max
*/
@@ -275,5 +277,6 @@
} else {
return new String[0];
}
+
}
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsProvider.java 2007-10-31 13:53:49 UTC (rev 4593)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsProvider.java 2007-10-31 14:59:11 UTC (rev 4594)
@@ -74,7 +74,7 @@
tv.getControl().getDisplay().syncExec(runnable);
}
- public void configurationRemoved(ConsoleConfiguration root) {
+ public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate) {
refreshTree();
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java 2007-10-31 13:53:49 UTC (rev 4593)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java 2007-10-31 14:59:11 UTC (rev 4594)
@@ -158,7 +158,7 @@
//ConsoleConfigurationPreferences ccp = createOldConsoleConfiguration( configName, cmode, projectName, useProjectClasspath, entityResolver, propertyFilename, cfgFile, mappings, classpaths, persistenceUnitName, namingStrategy );
if(oldConfig!=null) {
- KnownConfigurations.getInstance().removeConfiguration( oldConfig );
+ KnownConfigurations.getInstance().removeConfiguration( oldConfig, false );
}
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
17 years, 2 months
JBoss Tools SVN: r4593 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.help: src/java/org/hibernate/eclipse/help and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 09:53:49 -0400 (Wed, 31 Oct 2007)
New Revision: 4593
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.help/hibernate-build.xml
trunk/hibernatetools/plugins/org.hibernate.eclipse.help/src/java/org/hibernate/eclipse/help/HelpPlugin.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.help/toc.xml
Log:
removed API docs from hibernate help.
RHDS-230 and JBIDE-598
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/hibernate-build.xml
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/hibernate-build.xml 2007-10-31 13:50:13 UTC (rev 4592)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/hibernate-build.xml 2007-10-31 13:53:49 UTC (rev 4593)
@@ -26,7 +26,7 @@
<!-- take the api html (javadoc) files from here -->
<property name="hibernate-core.doc.api"
- location="${hibernate-core.home}/doc/api" />
+ location="${hibernate-core.home}/doc/api" />
<property name="tmpdir" location="tmp"/>
<target name="create-doc-zip">
@@ -40,9 +40,9 @@
</copy>
<!-- copy in the api javadoc output -->
- <copy todir="${tmpdir}/html/api">
+ <!--<copy todir="${tmpdir}/html/api">
<fileset dir="${hibernate-core.home}/doc/api"/>
- </copy>
+ </copy>-->
<!-- copy in the eclipse docs -->
<copy todir="${tmpdir}/html/tools/eclipse">
@@ -105,6 +105,8 @@
<arg value="${refdoc.toc.translation}"/>
</java>
+ <!-- API -->
+ <!--
<java classname="com.icl.saxon.StyleSheet" fork="true">
<classpath refid="lib.classpath"/>
<arg value="-o"/>
@@ -112,6 +114,7 @@
<arg value="${hibernate.src.top}/build.xml"/>
<arg value="${apiref.toc.translation}"/>
</java>
+ -->
</target>
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/src/java/org/hibernate/eclipse/help/HelpPlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/src/java/org/hibernate/eclipse/help/HelpPlugin.java 2007-10-31 13:50:13 UTC (rev 4592)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/src/java/org/hibernate/eclipse/help/HelpPlugin.java 2007-10-31 13:53:49 UTC (rev 4593)
@@ -88,7 +88,7 @@
public ResourceBundle getResourceBundle() {
try {
if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.hibernate.eclipse.help2.Help2PluginResources");
+ resourceBundle = ResourceBundle.getBundle("org.hibernate.eclipse.help.HelpPluginResources");
} catch (MissingResourceException x) {
resourceBundle = null;
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/toc.xml
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/toc.xml 2007-10-31 13:50:13 UTC (rev 4592)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/toc.xml 2007-10-31 13:53:49 UTC (rev 4593)
@@ -5,12 +5,12 @@
<topic label="Reference Documentation">
<link toc="tocreferencedocumentation.xml"/>
</topic>
- <topic label="API Reference">
+ <!-- <topic label="API Reference">
<link toc="tocapireference.xml"/>
- </topic>
- <topic label="Quick Reference">
+ </topic> -->
+ <!-- <topic label="Quick Reference">
<link toc="tocquickreference.xml"/>
- </topic>
+ </topic> -->
<topic label="Tools Documentation">
<link toc="toctoolsreference.xml"/>
</topic>
17 years, 2 months
JBoss Tools SVN: r4592 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-10-31 09:50:13 -0400 (Wed, 31 Oct 2007)
New Revision: 4592
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java
Log:
Added cheking of null in case of an event of deleted project.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java 2007-10-31 13:33:41 UTC (rev 4591)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java 2007-10-31 13:50:13 UTC (rev 4592)
@@ -17,10 +17,7 @@
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.widgets.Display;
@@ -109,8 +106,12 @@
*/
public boolean visit(IResourceDelta delta) throws CoreException {
if(skip) return false; // skip everything if MANIFEST.MF || WEB-INF are found already
- if("MANIFEST.MF".equals(delta.getResource().getLocation().lastSegment())
- || "META-INF".equals(delta.getResource().getLocation().lastSegment())){
+ IPath location = delta.getResource().getLocation();
+ if(location==null) {
+ return false;
+ }
+ if("MANIFEST.MF".equals(location.lastSegment())
+ || "META-INF".equals(location.lastSegment())){
skip = true;
return false;
}
17 years, 2 months
JBoss Tools SVN: r4591 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 09:33:41 -0400 (Wed, 31 Oct 2007)
New Revision: 4591
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java
Log:
minor optimization
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java 2007-10-31 13:23:27 UTC (rev 4590)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java 2007-10-31 13:33:41 UTC (rev 4591)
@@ -41,7 +41,7 @@
* @see org.eclipse.ui.IStartup#earlyStartup()
*/
public void earlyStartup() {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(new WebContentUpdater());
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(new WebContentUpdater(), IResourceChangeEvent.POST_CHANGE);
}
public static class WebContentUpdater implements IResourceChangeListener {
17 years, 2 months
JBoss Tools SVN: r4590 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 09:23:27 -0400 (Wed, 31 Oct 2007)
New Revision: 4590
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java
Log:
fix to Workaround207146 to not run when not needed and make sure all deltas are checkked.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java 2007-10-31 08:05:04 UTC (rev 4589)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java 2007-10-31 13:23:27 UTC (rev 4590)
@@ -46,6 +46,10 @@
public static class WebContentUpdater implements IResourceChangeListener {
public void resourceChanged(IResourceChangeEvent event) {
+ if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
+ //SeamGuiPlugin.getDefault().logInfo("No reason to run");
+ return;
+ }
ManifestChangeDetector visitor = new ManifestChangeDetector();
try {
event.getDelta().accept(visitor);
@@ -55,7 +59,7 @@
if(visitor.skip) return; // skip listener if MANIFEST.MF and WEB-INF were changed
IResourceDelta[] delta = event.getDelta().getAffectedChildren();
-
+
// go trough changed resources
for (IResourceDelta resourceDelta : delta) {
IProject prj = resourceDelta.getResource().getProject();
@@ -63,28 +67,33 @@
if(comp==null) continue;
final IVirtualFolder root = comp.getRootFolder();
// check that changes in WebContent folder
- if(event.getDelta().findMember(root.getUnderlyingFolder().getFullPath())==null) {
- return;
+ IResourceDelta foundMember = event.getDelta().findMember(root.getUnderlyingFolder().getFullPath());
+ if(foundMember!=null) {
+ //SeamGuiPlugin.getDefault().logInfo("Refreshing package explorer to workaround Eclipse bug 207146: " + findMember.getFullPath());
+ refreshPackageExplorer();
+ return; // only required to refresh once.
}
- // Refresh Package Explorer
- Display display = Display.getDefault();
- if(display==null) {
- return;
- }
- display.asyncExec(new Runnable() {
- public void run() {
- PackageExplorerPart p = PackageExplorerPart.getFromActivePerspective();
- if(p!=null) {
- TreeViewer tv = p.getTreeViewer();
- if(tv!=null) {
- tv.refresh();
- }
- }
- }
- });
+ }
+ }
+ private void refreshPackageExplorer() {
+ // Refresh Package Explorer
+ Display display = Display.getDefault();
+ if(display==null) {
return;
}
+ display.asyncExec(new Runnable() {
+ public void run() {
+ PackageExplorerPart p = PackageExplorerPart.getFromActivePerspective();
+ if(p!=null) {
+ TreeViewer tv = p.getTreeViewer();
+ if(tv!=null) {
+
+ tv.refresh();
+ }
+ }
+ }
+ });
}
}
17 years, 2 months
JBoss Tools SVN: r4589 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 04:05:04 -0400 (Wed, 31 Oct 2007)
New Revision: 4589
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
Log:
h3.2 updated driver list
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 07:34:45 UTC (rev 4588)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 08:05:04 UTC (rev 4589)
@@ -45,21 +45,24 @@
dialectNames.put("DB2/400", "org.hibernate.dialect.DB2400Dialect");
dialectNames.put("Derby", "org.hibernate.dialect.DerbyDialect");
dialectNames.put("FrontBase", "org.hibernate.dialect.FrontBaseDialect");
- dialectNames.put("Generic", "org.hibernate.dialect.GenericDialect");
+ //Not in 3.2 anymore dialectNames.put("Generic", "org.hibernate.dialect.GenericDialect");
dialectNames.put("HSQL", "org.hibernate.dialect.HSQLDialect");
dialectNames.put("Informix", "org.hibernate.dialect.InformixDialect");
dialectNames.put("Ingres", "org.hibernate.dialect.IngresDialect");
dialectNames.put("Interbase", "org.hibernate.dialect.InterbaseDialect");
dialectNames.put("Firebird", "org.hibernate.dialect.FirebirdDialect");
dialectNames.put("Mckoi SQL", "org.hibernate.dialect.MckoiDialect");
- dialectNames.put("MySQL", "org.hibernate.dialect.MySQLDialect");
+ dialectNames.put("MySQL", "org.hibernate.dialect.MySQLDialect");
dialectNames.put("MySQL (InnoDB)", "org.hibernate.dialect.MySQLInnoDBDialect");
- dialectNames.put("MySQL (MyISAM)", "org.hibernate.dialect.MySQLISAMDBDialect");
+ dialectNames.put("MySQL (MyISAM)", "org.hibernate.dialect.MySQLMyISAMDialect");
+ dialectNames.put("MySQL 5", "org.hibernate.dialect.MySQL5Dialect");
+ dialectNames.put("MySQL 5 (InnoDB)", "org.hibernate.dialect.MySQL5InnoDBDialect");
+ dialectNames.put("Oracle","org.hibernate.dialect.OracleDialect");
+ dialectNames.put("Oracle 8i","org.hibernate.dialect.Oracle8iDialect");
dialectNames.put("Oracle 9", "org.hibernate.dialect.Oracle9Dialect");
- dialectNames.put("Oracle","org.hibernate.dialect.OracleDialect");
+ dialectNames.put("Oracle 10g", "org.hibernate.dialect.Oracle10gDialect");
dialectNames.put("Pointbase", "org.hibernate.dialect.PointbaseDialect");
dialectNames.put("PostgreSQL", "org.hibernate.dialect.PostgreSQLDialect");
- //dialectNames.put("Postgress", "org.hibernate.dialect.PostgressDialect");
dialectNames.put("Progress", "org.hibernate.dialect.ProgressDialect");
dialectNames.put("SAP DB", "org.hibernate.dialect.SAPDBDialect");
dialectNames.put("Sybase", "org.hibernate.dialect.SybaseDialect");
@@ -89,6 +92,20 @@
"jdbc:oracle:thin:@<host>:<port1521>:<sid>" }
);
+ addDriverAndURLS("org.hibernate.dialect.Oracle10gDialect",
+ "oracle.jdbc.driver.OracleDriver",
+ new String[] {
+ "jdbc:oracle:thin:@localhost:1521:orcl",
+ "jdbc:oracle:thin:@<host>:<port1521>:<sid>" }
+ );
+
+ addDriverAndURLS("org.hibernate.dialect.Oracle8iDialect",
+ "oracle.jdbc.driver.OracleDriver",
+ new String[] {
+ "jdbc:oracle:thin:@localhost:1521:orcl",
+ "jdbc:oracle:thin:@<host>:<port1521>:<sid>" }
+ );
+
addDriverAndURLS("org.hibernate.dialect.MySQLDialect",
"org.gjt.mm.mysql.Driver",
new String[] {
@@ -116,7 +133,7 @@
);
- addDriverAndURLS("org.hibernate.dialect.MySQLMyISAMDBDialect",
+ addDriverAndURLS("org.hibernate.dialect.MySQLMyISAMDialect",
"org.gjt.mm.mysql.Driver",
new String[] {
"jdbc:mysql://<hostname>/<database>",
@@ -124,6 +141,22 @@
"jdbc:mysql:///<name>" }
);
+ addDriverAndURLS("org.hibernate.dialect.MySQL5Dialect",
+ "org.gjt.mm.mysql.Driver",
+ new String[] {
+ "jdbc:mysql://<hostname>/<database>",
+ "jdbc:mysql:///test",
+ "jdbc:mysql:///<name>" }
+ );
+
+ addDriverAndURLS("org.hibernate.dialect.MySQL5InnoDBDialect",
+ "org.gjt.mm.mysql.Driver",
+ new String[] {
+ "jdbc:mysql://<hostname>/<database>",
+ "jdbc:mysql:///test",
+ "jdbc:mysql:///<name>" }
+ );
+
addDriverAndURLS("org.hibernate.dialect.PostgreSQLDialect",
"org.postgresql.Driver",
new String[] {
17 years, 2 months
JBoss Tools SVN: r4588 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 03:34:45 -0400 (Wed, 31 Oct 2007)
New Revision: 4588
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
Log:
beautify the db type names
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 06:51:16 UTC (rev 4587)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2007-10-31 07:34:45 UTC (rev 4588)
@@ -41,8 +41,8 @@
public DriverClassHelpers() {
// externalize this!
dialectNames.put("DB2", "org.hibernate.dialect.DB2Dialect");
- dialectNames.put("DB2390", "org.hibernate.dialect.DB2390Dialect");
- dialectNames.put("DB2400", "org.hibernate.dialect.DB2400Dialect");
+ dialectNames.put("DB2/390", "org.hibernate.dialect.DB2390Dialect");
+ dialectNames.put("DB2/400", "org.hibernate.dialect.DB2400Dialect");
dialectNames.put("Derby", "org.hibernate.dialect.DerbyDialect");
dialectNames.put("FrontBase", "org.hibernate.dialect.FrontBaseDialect");
dialectNames.put("Generic", "org.hibernate.dialect.GenericDialect");
@@ -54,7 +54,7 @@
dialectNames.put("Mckoi SQL", "org.hibernate.dialect.MckoiDialect");
dialectNames.put("MySQL", "org.hibernate.dialect.MySQLDialect");
dialectNames.put("MySQL (InnoDB)", "org.hibernate.dialect.MySQLInnoDBDialect");
- dialectNames.put("MySQL (ISAMDB)", "org.hibernate.dialect.MySQLISAMDBDialect");
+ dialectNames.put("MySQL (MyISAM)", "org.hibernate.dialect.MySQLISAMDBDialect");
dialectNames.put("Oracle 9", "org.hibernate.dialect.Oracle9Dialect");
dialectNames.put("Oracle","org.hibernate.dialect.OracleDialect");
dialectNames.put("Pointbase", "org.hibernate.dialect.PointbaseDialect");
17 years, 2 months