JBoss Tools SVN: r4466 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-24 10:45:56 -0400 (Wed, 24 Oct 2007)
New Revision: 4466
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/ImportProjectAction.java
Log:
JBIDE-1156
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/ImportProjectAction.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/ImportProjectAction.java 2007-10-24 14:45:28 UTC (rev 4465)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/ImportProjectAction.java 2007-10-24 14:45:56 UTC (rev 4466)
@@ -23,6 +23,7 @@
import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.jboss.tools.jsf.ui.JsfUiImages;
import org.jboss.tools.jsf.ui.JsfUiPlugin;
+import org.jboss.tools.jsf.ui.wizard.project.ImportProjectWizard;
import org.jboss.tools.common.model.ui.*;
public class ImportProjectAction extends Action implements IWorkbenchWindowActionDelegate {
@@ -38,8 +39,11 @@
"org.jboss.tools.jsf.ui.wizard.project.ImportProjectWizard"
);
if (wizard != null) {
+ ((ImportProjectWizard)wizard).setHelpAvailable(false);
wizard.init(ModelUIPlugin.getDefault().getWorkbench(), null);
WizardDialog dialog = new WizardDialog(ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
+ dialog.create();
+ JsfUiPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(dialog.getShell(), "org.eclipse.ui.import_wizard_context");
dialog.open();
} else {
JsfUiPlugin.getPluginLog().logError("Unable to create wizard 'org.jboss.tools.jsf.ui.wizard.project.ImportProjectWizard'.");
18 years, 2 months
JBoss Tools SVN: r4465 - trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-24 10:45:28 -0400 (Wed, 24 Oct 2007)
New Revision: 4465
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/ImportProjectAction.java
Log:
JBIDE-1156
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/ImportProjectAction.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/ImportProjectAction.java 2007-10-24 14:45:06 UTC (rev 4464)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/internal/action/ImportProjectAction.java 2007-10-24 14:45:28 UTC (rev 4465)
@@ -20,6 +20,7 @@
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.jboss.tools.common.model.ui.*;
import org.jboss.tools.struts.ui.StrutsUIPlugin;
+import org.jboss.tools.struts.ui.wizard.project.ImportProjectWizard;
import org.jboss.tools.struts.messages.StrutsUIMessages;
public class ImportProjectAction extends Action implements IWorkbenchWindowActionDelegate {
@@ -35,8 +36,11 @@
"org.jboss.tools.struts.ui.wizard.project.ImportProjectWizard"
);
if (wizard != null) {
+ ((ImportProjectWizard)wizard).setHelpAvailable(false);
wizard.init(ModelUIPlugin.getDefault().getWorkbench(), null);
WizardDialog dialog = new WizardDialog(ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
+ dialog.create();
+ StrutsUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(dialog.getShell(), "org.eclipse.ui.import_wizard_context");
dialog.open();
} else {
StrutsUIPlugin.getPluginLog().logError("Unable to create wizard 'org.jboss.tools.struts.ui.wizard.project.ImportProjectWizard'.");
18 years, 2 months
JBoss Tools SVN: r4464 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-24 10:45:06 -0400 (Wed, 24 Oct 2007)
New Revision: 4464
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java
Log:
JBIDE-1156
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2007-10-24 14:35:19 UTC (rev 4463)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2007-10-24 14:45:06 UTC (rev 4464)
@@ -52,12 +52,12 @@
public ImportWebProjectWizard() {
setNeedsProgressMonitor(true);
+ setHelpAvailable(true);
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
this.workbench = workbench;
this.selection = selection;
- setHelpAvailable(true);
}
protected void installMainPage() {
18 years, 2 months
JBoss Tools SVN: r4463 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-24 10:35:19 -0400 (Wed, 24 Oct 2007)
New Revision: 4463
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XJob.java
Log:
RedHat was in statues label. replaced with jboss tools.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XJob.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XJob.java 2007-10-24 14:15:58 UTC (rev 4462)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XJob.java 2007-10-24 14:35:19 UTC (rev 4463)
@@ -97,7 +97,7 @@
List<XRunnable> list = new ArrayList<XRunnable>();
public XJob() {
- super("RedHat Model Update");
+ super("JBoss Tools Model Update");
setSystem(true);
}
18 years, 2 months
JBoss Tools SVN: r4462 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-24 10:15:58 -0400 (Wed, 24 Oct 2007)
New Revision: 4462
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/NewProjectRegisterPage.java
Log:
JBIDE-1139
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/NewProjectRegisterPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/NewProjectRegisterPage.java 2007-10-24 14:01:06 UTC (rev 4461)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/NewProjectRegisterPage.java 2007-10-24 14:15:58 UTC (rev 4462)
@@ -12,6 +12,7 @@
import org.jboss.tools.common.model.ui.attribute.XAttributeSupport;
import org.jboss.tools.common.model.ui.util.ModelUtilities;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -131,15 +132,20 @@
try {
appRegister.commit();
String msg = appRegister.getErrorMessage();
+ String wrn = null;
if(msg == null) {
- msg = context.validateServletVersion();
+ wrn = context.validateServletVersion();
}
if(msg != null) {
setErrorMessage(msg);
return false;
+ } else if(wrn != null) {
+ setErrorMessage(null);
+ setMessage(wrn, DialogPage.WARNING);
+ } else {
+ setErrorMessage(null);
+ setMessage(null);
}
- setErrorMessage(null);
- setMessage(null);
return true;
} finally {
lock = false;
18 years, 2 months
JBoss Tools SVN: r4461 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-10-24 10:01:06 -0400 (Wed, 24 Oct 2007)
New Revision: 4461
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1168 Igore Resource is out of sync with the file system during validation
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2007-10-24 13:52:03 UTC (rev 4460)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2007-10-24 14:01:06 UTC (rev 4461)
@@ -126,7 +126,8 @@
try {
content = FileUtil.readStream(file.getContents());
} catch (CoreException e) {
- SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_EL_VALIDATOR_ERROR_VALIDATING_SEAM_EL, e);
+ // It could be because of resource is out of sync with the file system
+ // Just ignore this.
return;
}
if(ext.equalsIgnoreCase("java")) { //$NON-NLS-1$
18 years, 2 months
JBoss Tools SVN: r4460 - 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-24 09:52:03 -0400 (Wed, 24 Oct 2007)
New Revision: 4460
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java
Log:
JBIDE-1155
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2007-10-24 13:39:20 UTC (rev 4459)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context/ImportWebProjectContext.java 2007-10-24 13:52:03 UTC (rev 4460)
@@ -13,7 +13,10 @@
import java.io.File;
import java.util.*;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.XAttribute;
@@ -95,7 +98,11 @@
public IProject getProjectHandle() {
String n = getProjectName();
- return (n == null) ? null : ResourcesPlugin.getWorkspace().getRoot().getProject(n);
+ if(n == null || n.length() == 0) return null;
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IStatus nameStatus = workspace.validateName(projectName, IResource.PROJECT);
+ if (!nameStatus.isOK()) return null;
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(n);
}
public String getApplicationName() {
18 years, 2 months
JBoss Tools SVN: r4459 - in trunk/seam: plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-24 09:39:20 -0400 (Wed, 24 Oct 2007)
New Revision: 4459
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java
Log:
JBIDE-1145 List and Home.java was not being generated correctly
Bogus implementation of getActionsFolder() and getBeansFolder() was changed to be correct (but hardcoded)
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java 2007-10-24 12:39:30 UTC (rev 4458)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java 2007-10-24 13:39:20 UTC (rev 4459)
@@ -10,28 +10,18 @@
******************************************************************************/
package org.jboss.tools.seam.core;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
/**
@@ -123,7 +113,7 @@
}
/**
- * Returns list of EJB projects.
+ *
* @return
*/
public IProject getTestProject() {
@@ -131,63 +121,28 @@
}
/**
- * Returns Content folder of EAR project or null
- * if EAR is not available.
- * @return
+ *
+ * @return the action folder (this folder is not guaranteed to exist!)
*/
- public IFolder getActionsFolder() {
- IFolder actionsFolder = null;
+ public IFolder getActionFolder() {
if(isWarConfiguration()) {
- IVirtualComponent com = ComponentCore.createComponent(war);
- IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- final IVirtualFolder srcRootFolder = com.getRootFolder().getFolder(new Path("/WEB-INF/classes")); //$NON-NLS-1$
- IContainer[] folder = webRootFolder.getUnderlyingFolders();
- if(folder.length==1) {
- actionsFolder = (IFolder)folder[0];
- } else if(folder.length>1) {
- IContainer parent = folder[0].getParent();
- IResource actions = parent.findMember("actions"); //$NON-NLS-1$
- if(actions!=null && actions instanceof IFolder) {
- actionsFolder = (IFolder)actions;
- } else {
- actionsFolder = (IFolder)folder[0];
- }
- }
+ return war.getFolder("src/action");
} else {
- IVirtualComponent com = ComponentCore.createComponent(ejb);
- IVirtualFolder ejbRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- actionsFolder = (IFolder)ejbRootFolder.getUnderlyingFolder();
+ return getEjbProject().getFolder("ejbModule");
}
- return actionsFolder;
+
}
/**
- * Returns Content folder for first found WAR project.
- * @return
+ *
+ * @return the model folder if exists, otherwise null
*/
- public IFolder getBeansFolder() {
- IFolder actionsFolder = null;
+ public IFolder getModelFolder() {
if(isWarConfiguration()) {
- IVirtualComponent com = ComponentCore.createComponent(war);
- final IVirtualFolder srcRootFolder = com.getRootFolder().getFolder(new Path("/WEB-INF/classes")); //$NON-NLS-1$
- IContainer[] folder = srcRootFolder.getUnderlyingFolders();
- if(folder.length==1) {
- actionsFolder = (IFolder)folder[0];
- } else if(folder.length>1) {
- IContainer parent = folder[0].getParent();
- IResource actions = parent.findMember("model"); //$NON-NLS-1$
- if(actions!=null && actions instanceof IFolder) {
- actionsFolder = (IFolder)actions;
- } else {
- actionsFolder = (IFolder)folder[0];
- }
- }
+ return war.getFolder("src/model");
} else {
- IVirtualComponent com = ComponentCore.createComponent(ejb);
- IVirtualFolder ejbRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- actionsFolder = (IFolder)ejbRootFolder.getUnderlyingFolder();
- }
- return actionsFolder;
+ return getEjbProject().getFolder("ejbModule");
+ }
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-10-24 12:39:30 UTC (rev 4458)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-10-24 13:39:20 UTC (rev 4459)
@@ -79,8 +79,8 @@
SeamProjectsSet seamProjectsSet = SeamProjectsSet.create(project);
wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR,
- seamProjectsSet.getBeansFolder()==null?
- "":seamProjectsSet.getBeansFolder().getFullPath().toString()); //$NON-NLS-1$
+ seamProjectsSet.getModelFolder()==null?
+ "":seamProjectsSet.getModelFolder().getFullPath().toString()); //$NON-NLS-1$
boolean isReverseEngineer = "true".equals(params.get(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER)); //$NON-NLS-1$
wc.setAttribute(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, isReverseEngineer);
@@ -234,7 +234,7 @@
hbmtemplateAttributes.put("file_pattern", "{package-name}/{class-name}List.java"); //$NON-NLS-1$ //$NON-NLS-2$
}
hbmtemplateAttributes.put("template_name", "src/EntityList.java.ftl"); //$NON-NLS-1$ //$NON-NLS-2$
- hbmtemplateAttributes.put("outputdir",seamProjectsSet.getActionsFolder().getFullPath().toString()); //$NON-NLS-1$
+ hbmtemplateAttributes.put("outputdir",seamProjectsSet.getActionFolder().getFullPath().toString()); //$NON-NLS-1$
hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$
hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -269,7 +269,7 @@
}
hbmtemplateAttributes.put("template_name", "src/EntityHome.java.ftl"); //$NON-NLS-1$ //$NON-NLS-2$
- hbmtemplateAttributes.put("outputdir",seamProjectsSet.getActionsFolder().getFullPath().toString()); //$NON-NLS-1$
+ hbmtemplateAttributes.put("outputdir",seamProjectsSet.getActionFolder().getFullPath().toString()); //$NON-NLS-1$
hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$
hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$
wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate8.properties", hbmtemplateAttributes); //$NON-NLS-1$
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2007-10-24 12:39:30 UTC (rev 4458)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2007-10-24 13:39:20 UTC (rev 4459)
@@ -18,6 +18,7 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
@@ -145,6 +146,10 @@
fproj.installProjectFacet(getSeamFacetVersion(), config, null);
+ SeamProjectsSet seamProjectsSet = new SeamProjectsSet(fproj.getProject());
+ assertTrue(seamProjectsSet.getActionFolder().exists());
+ assertTrue(seamProjectsSet.getModelFolder().exists());
+
return fproj;
}
@@ -183,7 +188,7 @@
assertTrue(testProject.exists());
assertTrue(ejbProject.exists());
assertTrue(earProject.exists());
-
+
return fproj;
}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2007-10-24 12:39:30 UTC (rev 4458)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2007-10-24 13:39:20 UTC (rev 4459)
@@ -45,4 +45,5 @@
assertTrue(fproj.getProject().findMember("src/action/x/y/z").exists());
}
+
}
18 years, 2 months
JBoss Tools SVN: r4458 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-24 08:39:30 -0400 (Wed, 24 Oct 2007)
New Revision: 4458
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties
Log:
JBIDE-1149
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2007-10-24 12:39:11 UTC (rev 4457)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2007-10-24 12:39:30 UTC (rev 4458)
@@ -290,10 +290,13 @@
FileWebApp_Properties=/struts_pro/FileWebApp_Properties.html
FileWebApp_Properties.WindowTitle=Edit Properties
FileWebApp_Properties.Title=File Web Descriptor
+FileWebApp.editorTitle=Web XML Editor
FileWebApp24_Properties=/struts_pro/FileWebApp_Properties.html
FileWebApp24_Properties.WindowTitle=Edit Properties
FileWebApp24_Properties.Title=File Web Descriptor
+FileWebApp24.editorTitle=Web XML Editor
+FileWebApp25.editorTitle=Web XML Editor
FileWebApp_CreateContextParam=/struts_pro/FileWebApp_CreateContextParam.html
18 years, 2 months
JBoss Tools SVN: r4457 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-10-24 08:39:11 -0400 (Wed, 24 Oct 2007)
New Revision: 4457
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/WebCompoundEditor.java
Log:
JBIDE-1149
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/WebCompoundEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/WebCompoundEditor.java 2007-10-24 12:38:44 UTC (rev 4456)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/WebCompoundEditor.java 2007-10-24 12:39:11 UTC (rev 4457)
@@ -11,6 +11,7 @@
package org.jboss.tools.jst.web.ui.editors;
import org.jboss.tools.common.editor.TreeFormPage;
+import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.ui.editor.EditorDescriptor;
import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor;
import org.jboss.tools.jst.web.tld.model.EditorTreeConstraint;
@@ -20,7 +21,13 @@
protected void doCreatePages() {
if(isAppropriateNature()) {
treeFormPage = createTreeFormPage();
- treeFormPage.setTitle("Web XML Editor");
+ String title = "Web XML Editor";
+ if(object != null) {
+ String key = object.getModelEntity().getName() + ".editorTitle";
+ String s = WizardKeys.getString(key);
+ if(s != null) title = s;
+ }
+ treeFormPage.setTitle(title);
((TreeFormPage)treeFormPage).addFilter(new EditorTreeConstraint());
treeFormPage.initialize(object);
addFormPage(treeFormPage);
18 years, 2 months