JBoss Tools SVN: r4613 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-11-01 07:24:29 -0400 (Thu, 01 Nov 2007)
New Revision: 4613
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1130 Since that user cannot create seam runtime with "wrong" version within new seam project wizard. (Restored)
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-11-01 11:14:20 UTC (rev 4612)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-11-01 11:24:29 UTC (rev 4613)
@@ -22,9 +22,7 @@
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.IProfileListener;
import org.eclipse.datatools.connectivity.ProfileManager;
-import org.eclipse.datatools.connectivity.db.generic.IDBConnectionProfileConstants;
import org.eclipse.datatools.connectivity.db.generic.ui.NewConnectionProfileWizard;
-import org.eclipse.datatools.connectivity.internal.ConnectionProfileManager;
import org.eclipse.datatools.connectivity.internal.ui.wizards.NewCPWizard;
import org.eclipse.datatools.connectivity.internal.ui.wizards.NewCPWizardCategoryFilter;
import org.eclipse.jdt.core.JavaConventions;
@@ -34,7 +32,6 @@
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.ejb.provider.HomeInterfaceProviderHelper;
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -47,9 +44,9 @@
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
+import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -651,16 +648,18 @@
public void run() {
List<SeamRuntime> added = new ArrayList<SeamRuntime>();
+ String seamVersion = model.getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString();
+ List<SeamVersion> versians = new ArrayList<SeamVersion>(1);
+ versians.add(SeamVersion.parseFromString(seamVersion));
Wizard wiz = new SeamRuntimeNewWizard((List<SeamRuntime>)
new ArrayList<SeamRuntime>(Arrays.asList(SeamRuntimeManager.getInstance().getRuntimes()))
- ,added);
+ , added, versians);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wiz);
dialog.open();
if (added.size()>0) {
SeamRuntimeManager.getInstance().addRuntime(added.get(0));
- String seamVersion = model.getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString();
List<String> runtimes = getRuntimeNames(seamVersion);
SeamRuntime newRuntime = added.get(0);
if(seamVersion.equals(newRuntime.getVersion().toString())) {
17 years, 1 month
JBoss Tools SVN: r4612 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-01 07:14:20 -0400 (Thu, 01 Nov 2007)
New Revision: 4612
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta
Log:
JBIDE-1240
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta 2007-11-01 00:56:02 UTC (rev 4611)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta 2007-11-01 11:14:20 UTC (rev 4612)
@@ -2344,7 +2344,9 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%Regular2%" XMLSUBPATH="column" name="Hibernate3Column">
- <XChildrenEntities/>
+ <XChildrenEntities>
+ <XChildEntity maxCount="1" name="Hibernate3Comment"/>
+ </XChildrenEntities>
<XEntityRenderer>
<ICONS>
<ICON info="main.hibernate.column" type="main"/>
@@ -2413,6 +2415,17 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Hibernate3Replace%"
+ ICON="main.hibernate.comment"
+ PROPERTIES="significanceMessageClass=%Replace%;child=comment"
+ WizardClassName="%Default%" displayName="Comment..." kind="action" name="AddComment">
+ <EntityData EntityName="Hibernate3Comment">
+ <AttributeData AttributeName="value" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
17 years, 1 month
JBoss Tools SVN: r4611 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-31 20:56:02 -0400 (Wed, 31 Oct 2007)
New Revision: 4611
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java
Log:
fix compilation errors
[java] [javac] 18. ERROR in /home/hudson/rhds-build/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java (at line 92)
[java] [javac] Iterator ollectionMappingsIterator = consoleConfiguration.getConfiguration().getCollectionMappings();
[java] [javac] ^
[java] [javac] Syntax error on token "Invalid Character", delete this token
[java] [javac] ----------
[java] [javac] 19. ERROR in /home/hudson/rhds-build/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java (at line 93)
[java] [javac] while ( ollectionMappingsIterator.hasNext()) {
[java] [javac] ^
[java] [javac] Syntax error on token "Invalid Character", delete this token
[java] [javac] ----------
[java] [javac] 20. ERROR in /home/hudson/rhds-build/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java (at line 94)
[java] [javac] Collection elem = (Collection) ollectionMappingsIterator.next();
[java] [javac] ^
[java] [javac] Syntax error on token "Invalid Character", delete this token
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2007-11-01 00:16:08 UTC (rev 4610)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2007-11-01 00:56:02 UTC (rev 4611)
@@ -93,7 +93,7 @@
if (resource == null) {
Iterator collectionMappingsIterator = consoleConfiguration.getConfiguration().getCollectionMappings();
while (collectionMappingsIterator.hasNext()) {
- Collection elem = (Collection) collectionMappingsIterator.next();
+ Collection elem = (Collection)collectionMappingsIterator.next();
Table collectionTable = elem.getCollectionTable();
if (HibernateUtils.getTableName(collectionTable).equals(HibernateUtils.getTableName(table))) {
PersistentClass owner = elem.getOwner();
17 years, 2 months
JBoss Tools SVN: r4610 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-31 20:16:08 -0400 (Wed, 31 Oct 2007)
New Revision: 4610
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1238
if(event.getDelta()!=null) addedt before invocing any method on delta in resource change event
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-11-01 00:16:06 UTC (rev 4609)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/WorkaroundFor207146.java 2007-11-01 00:16:08 UTC (rev 4610)
@@ -43,7 +43,7 @@
public static class WebContentUpdater implements IResourceChangeListener {
public void resourceChanged(IResourceChangeEvent event) {
- if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
+ if (event.getType() != IResourceChangeEvent.POST_CHANGE || event.getDelta()==null) {
//SeamGuiPlugin.getDefault().logInfo("No reason to run");
return;
}
17 years, 2 months
JBoss Tools SVN: r4609 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-31 20:16:06 -0400 (Wed, 31 Oct 2007)
New Revision: 4609
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1238
if(event.getDelta()!=null) addedt before invocing any method on delta in resource change event
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2007-11-01 00:16:03 UTC (rev 4608)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2007-11-01 00:16:06 UTC (rev 4609)
@@ -254,17 +254,19 @@
public ArrayList<IPath> list = new ArrayList<IPath>();
public void resourceChanged(IResourceChangeEvent event) {
try {
- event.getDelta().accept(this);
- ArrayList<IPath> clone;
- if( list.size() > 0 ) {
- synchronized(this) {
- clone = new ArrayList<IPath>();
- clone.addAll(list);
- list.clear();
+ if(event.getDelta()!=null) {
+ event.getDelta().accept(this);
+ ArrayList<IPath> clone;
+ if( list.size() > 0 ) {
+ synchronized(this) {
+ clone = new ArrayList<IPath>();
+ clone.addAll(list);
+ list.clear();
+ }
+
+ UndeployFromServerJob job = new UndeployFromServerJob(clone);
+ job.schedule();
}
-
- UndeployFromServerJob job = new UndeployFromServerJob(clone);
- job.schedule();
}
} catch( CoreException ce ) {
}
17 years, 2 months
JBoss Tools SVN: r4608 - trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-31 20:16:03 -0400 (Wed, 31 Oct 2007)
New Revision: 4608
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1238
if(event.getDelta()!=null) addedt before invocing any method on delta in resource change event
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java 2007-10-31 20:46:50 UTC (rev 4607)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java 2007-11-01 00:16:03 UTC (rev 4608)
@@ -52,15 +52,17 @@
IResourceDelta delta = event.getDelta();
try {
- delta.accept(new IResourceDeltaVisitor() {
- public boolean visit(IResourceDelta delta) throws CoreException {
- if( delta.getResource() != null && delta.getResource().getLocation() != null &&
- delta.getResource().getLocation().lastSegment().equals(ArchivesModel.PROJECT_PACKAGES_FILE)) {
- projects.add(delta.getResource().getProject());
+ if(delta!=null) {
+ delta.accept(new IResourceDeltaVisitor() {
+ public boolean visit(IResourceDelta delta) throws CoreException {
+ if( delta.getResource() != null && delta.getResource().getLocation() != null &&
+ delta.getResource().getLocation().lastSegment().equals(ArchivesModel.PROJECT_PACKAGES_FILE)) {
+ projects.add(delta.getResource().getProject());
+ }
+ return true;
}
- return true;
- }
- });
+ });
+ }
} catch( CoreException ce ) {
}
Iterator i = projects.iterator();
17 years, 2 months