JBoss Tools SVN: r4275 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-16 19:57:49 -0400 (Tue, 16 Oct 2007)
New Revision: 4275
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1094
during fixing refresh algorithm is affected, so http://jira.jboss.com/jira/browse/JBIDE-1057 can be fixed.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2007-10-16 23:57:46 UTC (rev 4274)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2007-10-16 23:57:49 UTC (rev 4275)
@@ -12,12 +12,14 @@
package org.jboss.tools.seam.ui.wizard;
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.tools.ant.types.FilterSetCollection;
+import org.apache.tools.ant.util.FileUtils;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.AbstractOperation;
import org.eclipse.core.resources.IContainer;
@@ -38,6 +40,7 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.internal.core.project.facet.AntCopyUtils;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
@@ -60,18 +63,20 @@
// TODO Auto-generated constructor stub
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+ /**
+ * @see AbstractOperation#execute(IProgressMonitor, IAdaptable)
*/
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
+ IStatus result = Status.OK_STATUS;
Map<String, INamedElement> params = (Map)info.getAdapter(Map.class);
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
params.get(IParameter.SEAM_PROJECT_NAME).getValueAsString());
Map<String, Object> vars = new HashMap<String, Object>();
IEclipsePreferences seamFacetPrefs = SeamCorePlugin.getSeamPreferences(project);
+ SeamProjectsSet seamPrjSet = new SeamProjectsSet(project);
try {
@@ -98,8 +103,9 @@
vars.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, SeamRuntimeManager.getInstance().getRuntimeForProject(project).getHomeDir());
vars.put(IParameter.SEAM_PROJECT_LOCATION_PATH,project.getLocation().toFile().toString());
vars.put(IParameter.SEAM_PROJECT_WEBCONTENT_PATH,webRootContainer.getLocation().toFile().toString());
- vars.put(IParameter.SEAM_EJB_PROJECT_LOCATION_PATH,project.getLocation().removeLastSegments(1).append(project.getName()+"-ejb").toFile().toString()); //$NON-NLS-1$
- vars.put(IParameter.SEAM_TEST_PROJECT_LOCATION_PATH,project.getLocation().removeLastSegments(1).append(project.getName()+"-test").toFile().toString()); //$NON-NLS-1$
+
+ vars.put(IParameter.SEAM_EJB_PROJECT_LOCATION_PATH,seamPrjSet.getEjbProject().getLocation().toFile().toString());
+ vars.put(IParameter.SEAM_TEST_PROJECT_LOCATION_PATH,seamPrjSet.getTestProject().getLocation().toFile().toString());
vars.put(ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH, actionFolder.replace('.','/'));
vars.put(ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, actionFolder);
vars.put(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH, testFolder.replace('.','/'));
@@ -114,13 +120,11 @@
int index=0;
for (String[] mapping : fileMappingCopy) {
file[index] = new File(mapping[1]);
- AntCopyUtils.copyFileToFile(new File(mapping[0]),file[index],filters,true);
+ FileUtils.getFileUtils().copyFile(new File(mapping[0]), file[index],filters,true);
index++;
}
- project.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, monitor);
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
- project.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
+ seamPrjSet.refreshLocal(monitor);
if(file.length > 0){
IFile iFile = project.getWorkspace().getRoot().getFileForLocation(new Path(file[0].getAbsolutePath()));
@@ -128,11 +132,13 @@
}
} catch (CoreException e) {
- SeamCorePlugin.getPluginLog().logError(e);
+ result = new Status(IStatus.ERROR,SeamGuiPlugin.PLUGIN_ID,e.getMessage(),e);
} catch (BackingStoreException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
- return Status.OK_STATUS;
+ result = new Status(IStatus.ERROR,SeamGuiPlugin.PLUGIN_ID,e.getMessage(),e);
+ } catch (IOException e) {
+ result = new Status(IStatus.ERROR,SeamGuiPlugin.PLUGIN_ID,e.getMessage(),e);
+ }
+ return result;
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-10-16 23:57:46 UTC (rev 4274)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-10-16 23:57:49 UTC (rev 4275)
@@ -20,13 +20,18 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.jboss.tools.seam.ui.SeamUIMessages;
/**
@@ -60,15 +65,17 @@
protected void execute(IProgressMonitor monitor)
throws CoreException, InvocationTargetException,
InterruptedException {
+ IStatus result;
IUndoableOperation operation = getOperation();
IOperationHistory operationHistory = workbench.getOperationSupport().getOperationHistory();
IUndoContext undoContext = workbench.getOperationSupport().getUndoContext();
operation.addContext(undoContext);
try {
- operationHistory.execute(operation, monitor, (IAdaptable)getPages()[0]);
+ result = operationHistory.execute(operation, monitor, (IAdaptable)getPages()[0]);
} catch (ExecutionException e) {
- SeamCorePlugin.getPluginLog().logError(e);
+ result = new Status(IStatus.ERROR,SeamGuiPlugin.PLUGIN_ID,e.getMessage(),e);
}
+// ErrorDialog.openError(Display.getCurrent().getActiveShell(), SeamUIMessages.SeamBaseWizard_0, result.getMessage(), result);
}
});
} catch (InvocationTargetException e) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java 2007-10-16 23:57:46 UTC (rev 4274)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java 2007-10-16 23:57:49 UTC (rev 4275)
@@ -25,7 +25,7 @@
public class SeamConversationWizardPage1 extends SeamBaseWizardPage {
public SeamConversationWizardPage1() {
- super("seam.new.conversation.page1",SeamUIMessages.SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION,null); //$NON-NLS-1$
+ super("seam.new.conversation.page1",SeamUIMessages.SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION,null);
setMessage(getDefaultMessageText());
}
@@ -36,7 +36,7 @@
public void createControl(Composite parent) {
setControl(new GridLayoutComposite(parent));
- if (!"".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())){ //$NON-NLS-1$
+ if (!"".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())){
Map errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(
getEditor(IParameter.SEAM_PROJECT_NAME).getValue(), null);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2007-10-16 23:57:46 UTC (rev 4274)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2007-10-16 23:57:49 UTC (rev 4275)
@@ -32,7 +32,7 @@
*
*/
public SeamEntityWizardPage1() {
- super("seam.new.entity.page1",SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_SEAM_ENTITY, null); //$NON-NLS-1$
+ super("seam.new.entity.page1","Seam Entity", null);
setMessage(getDefaultMessageText());
}
@@ -56,15 +56,15 @@
@Override
public void doFillDefaults(PropertyChangeEvent event) {
if(event.getPropertyName().equals(IParameter.SEAM_ENTITY_CLASS_NAME)) {
- if(event.getNewValue()==null||"".equals(event.getNewValue().toString().trim())) { //$NON-NLS-1$
- setDefaultValue(IParameter.SEAM_ENTITY_CLASS_NAME, ""); //$NON-NLS-1$
- setDefaultValue(IParameter.SEAM_MASTER_PAGE_NAME, ""); //$NON-NLS-1$
- setDefaultValue(IParameter.SEAM_PAGE_NAME, ""); //$NON-NLS-1$
+ if(event.getNewValue()==null||"".equals(event.getNewValue().toString().trim())) {
+ setDefaultValue(IParameter.SEAM_ENTITY_CLASS_NAME, "");
+ setDefaultValue(IParameter.SEAM_MASTER_PAGE_NAME, "");
+ setDefaultValue(IParameter.SEAM_PAGE_NAME, "");
} else {
String value = event.getNewValue().toString();
String valueU = value.substring(0,1).toUpperCase() + value.substring(1);
String valueL = value.substring(0,1).toLowerCase() + value.substring(1);
- setDefaultValue(IParameter.SEAM_MASTER_PAGE_NAME, valueL+SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_LIST);
+ setDefaultValue(IParameter.SEAM_MASTER_PAGE_NAME, valueL+"List");
setDefaultValue(IParameter.SEAM_PAGE_NAME, valueL);
}
}
@@ -95,7 +95,7 @@
}
errors = ValidatorFactory.FILE_NAME_VALIDATOR.validate(
- editorRegistry.get(IParameter.SEAM_MASTER_PAGE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE,project});
+ editorRegistry.get(IParameter.SEAM_MASTER_PAGE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE,project,project});
if(errors.size()>0) {
setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
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-16 23:57:46 UTC (rev 4274)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-10-16 23:57:49 UTC (rev 4275)
@@ -30,7 +30,7 @@
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.ui.INewWizard;
import org.hibernate.eclipse.launch.HibernateLaunchConstants;
-import org.jboss.tools.seam.core.J2EEProjects;
+import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
@@ -71,7 +71,7 @@
HibernateLaunchConstants.ATTR_CONSOLE_CONFIGURATION_NAME,
params.get(IParameter.HIBERNATE_CONFIGURATION_NAME));
- J2EEProjects seamProjectsSet = J2EEProjects.create(project);
+ SeamProjectsSet seamProjectsSet = SeamProjectsSet.create(project);
wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR,
seamProjectsSet.getBeansFolder()==null?
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4274 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core/project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-16 19:57:46 -0400 (Tue, 16 Oct 2007)
New Revision: 4274
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java
Removed:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/J2EEProjects.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/SeamAnnotations.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1094
during fixing refresh algorithm is affected, so http://jira.jboss.com/jira/browse/JBIDE-1057 can be fixed.
Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/J2EEProjects.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/J2EEProjects.java 2007-10-16 22:48:11 UTC (rev 4273)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/J2EEProjects.java 2007-10-16 23:57:46 UTC (rev 4274)
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-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.IPath;
-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.SeamFacetPreference;
-import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
-
-/**
- * Helper class that collects related J2EE projects for
- * a given 'seed' project.
- *
- * If seed project is EAR, it's referenced projects are used to fill
- * lists with WAR and EJB projects.
- *
- * If seed project is referenced by a EAR project (the first occurrence is taken),
- * that EAR is used as seed project.
- *
- * If seed project is WAR or EJB not referenced by any EAR project,
- * field 'ear' remains null, and only lists 'wars' and 'ejbs' are available.
- *
- * Also this class provides helper methods to obtain root folders
- * for involved EAR, WAR and EJB projects.
- *
- * @author Viacheslav Kabanovich
- */
-public class J2EEProjects {
- IProject ear;
- IProject war;
- IProject ejb;
- IProject test;
- IEclipsePreferences prefs;
-
- /**
- * @param project
- * @return
- */
- public static J2EEProjects create(IProject project) {
- return new J2EEProjects(project);
- }
-
- private J2EEProjects(IProject project) {
-
- IScopeContext projectScope = new ProjectScope(project);
- prefs = projectScope.getNode(SeamCorePlugin.PLUGIN_ID);
-
- war = project;
-
- String earName = prefs.get(
- ISeamFacetDataModelProperties.SEAM_EAR_PROJECT,project.getName()+"-ear"); //$NON-NLS-1$
- if(earName!=null && !"".equals(earName.trim())) { //$NON-NLS-1$
- ear = (IProject)project.getWorkspace().getRoot().findMember(earName);
- }
- String ejbName = prefs.get(
- ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,project.getName()+"-ejb"); //$NON-NLS-1$
- if(ejbName!=null && !"".equals(ejbName.trim())) { //$NON-NLS-1$
- ejb = (IProject)project.getWorkspace().getRoot().findMember(ejbName);
- }
- String testName = prefs.get(
- ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,project.getName()+"test"); //$NON-NLS-1$
- if(testName!=null && !"".equals(testName)) { //$NON-NLS-1$
- test = (IProject)project.getWorkspace().getRoot().findMember(testName);
- }
- }
-
- public boolean isWarConfiguration() {
- return prefs.get(
- ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
- ISeamFacetDataModelProperties.DEPLOY_AS_WAR)
- .equals(ISeamFacetDataModelProperties.DEPLOY_AS_WAR);
- }
-
- /**
- * Returns list of WAR projects.
- * @return
- */
- public IProject getWarProject() {
- return war;
- }
-
- /**
- * Returns EAR project or null, if WAR project is not used by EAR.
- * @return
- */
- public IProject getEarProject() {
- return ear;
- }
-
- /**
- * Returns list of EJB projects.
- * @return
- */
- public IProject getEJBProject() {
- return ejb;
- }
-
- /**
- * Returns list of EJB projects.
- * @return
- */
- public IProject getTestProject() {
- return test;
- }
-
- /**
- * Returns Content folder of EAR project or null
- * if EAR is not available.
- * @return
- */
- public IFolder getActionsFolder() {
- IFolder actionsFolder = null;
- 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];
- }
- }
- } else {
- IVirtualComponent com = ComponentCore.createComponent(ejb);
- IVirtualFolder ejbRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- actionsFolder = (IFolder)ejbRootFolder.getUnderlyingFolder();
- }
- return actionsFolder;
- }
-
- /**
- * Returns Content folder for first found WAR project.
- * @return
- */
- public IFolder getBeansFolder() {
- IFolder actionsFolder = null;
- 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];
- }
- }
- } else {
- IVirtualComponent com = ComponentCore.createComponent(ejb);
- IVirtualFolder ejbRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- actionsFolder = (IFolder)ejbRootFolder.getUnderlyingFolder();
- }
- return actionsFolder;
- }
-
- /**
- * Returns source roots for first found EJB project.
- * @return
- */
- public IFolder getViewsFolder() {
- IVirtualComponent com = ComponentCore.createComponent(war);
- IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
- return (IFolder)webRootFolder.getUnderlyingFolder();
- }
-
- /**
- * Returns source roots for first found EJB project.
- * @return
- */
- public IFolder getTestsFolder() {
- IResource testRes = test.findMember("test-src"); //$NON-NLS-1$
- IFolder testFolder = null;
- if(testRes instanceof IFolder) {
- testFolder = (IFolder)testRes;
- }
- return testFolder;
- }
-
- public String getEntityPackage(){
- return prefs.get(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "entity"); //$NON-NLS-1$
- }
-
-}
Copied: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java (from rev 4039, trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/J2EEProjects.java)
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamProjectsSet.java 2007-10-16 23:57:46 UTC (rev 4274)
@@ -0,0 +1,231 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+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.SeamFacetPreference;
+import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+
+/**
+ * Helper class that collects related J2EE projects for
+ * a given 'seed' project.
+ *
+ * If seed project is EAR, it's referenced projects are used to fill
+ * lists with WAR and EJB projects.
+ *
+ * If seed project is referenced by a EAR project (the first occurrence is taken),
+ * that EAR is used as seed project.
+ *
+ * If seed project is WAR or EJB not referenced by any EAR project,
+ * field 'ear' remains null, and only lists 'wars' and 'ejbs' are available.
+ *
+ * Also this class provides helper methods to obtain root folders
+ * for involved EAR, WAR and EJB projects.
+ *
+ * @author Viacheslav Kabanovich
+ */
+public class SeamProjectsSet {
+ IProject ear;
+ IProject war;
+ IProject ejb;
+ IProject test;
+ IEclipsePreferences prefs;
+
+ /**
+ * @param project
+ * @return
+ */
+ public static SeamProjectsSet create(IProject project) {
+ return new SeamProjectsSet(project);
+ }
+
+ public SeamProjectsSet(IProject project) {
+
+ IScopeContext projectScope = new ProjectScope(project);
+ prefs = projectScope.getNode(SeamCorePlugin.PLUGIN_ID);
+
+ war = project;
+
+ String earName = prefs.get(
+ ISeamFacetDataModelProperties.SEAM_EAR_PROJECT,project.getName()+"-ear"); //$NON-NLS-1$
+ if(earName!=null && !"".equals(earName.trim())) { //$NON-NLS-1$
+ ear = (IProject)project.getWorkspace().getRoot().findMember(earName);
+ }
+ String ejbName = prefs.get(
+ ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,project.getName()+"-ejb"); //$NON-NLS-1$
+ if(ejbName!=null && !"".equals(ejbName.trim())) { //$NON-NLS-1$
+ ejb = (IProject)project.getWorkspace().getRoot().findMember(ejbName);
+ }
+ String testName = prefs.get(
+ ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,project.getName()+"test"); //$NON-NLS-1$
+ if(testName!=null && !"".equals(testName)) { //$NON-NLS-1$
+ test = (IProject)project.getWorkspace().getRoot().findMember(testName);
+ }
+ }
+
+ public boolean isWarConfiguration() {
+ return prefs.get(
+ ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
+ ISeamFacetDataModelProperties.DEPLOY_AS_WAR)
+ .equals(ISeamFacetDataModelProperties.DEPLOY_AS_WAR);
+ }
+
+ /**
+ * Returns list of WAR projects.
+ * @return
+ */
+ public IProject getWarProject() {
+ return war;
+ }
+
+ /**
+ * Returns EAR project or null, if WAR project is not used by EAR.
+ * @return
+ */
+ public IProject getEarProject() {
+ return ear;
+ }
+
+ /**
+ * Returns list of EJB projects.
+ * @return
+ */
+ public IProject getEjbProject() {
+ return ejb;
+ }
+
+ /**
+ * Returns list of EJB projects.
+ * @return
+ */
+ public IProject getTestProject() {
+ return test;
+ }
+
+ /**
+ * Returns Content folder of EAR project or null
+ * if EAR is not available.
+ * @return
+ */
+ public IFolder getActionsFolder() {
+ IFolder actionsFolder = null;
+ 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];
+ }
+ }
+ } else {
+ IVirtualComponent com = ComponentCore.createComponent(ejb);
+ IVirtualFolder ejbRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
+ actionsFolder = (IFolder)ejbRootFolder.getUnderlyingFolder();
+ }
+ return actionsFolder;
+ }
+
+ /**
+ * Returns Content folder for first found WAR project.
+ * @return
+ */
+ public IFolder getBeansFolder() {
+ IFolder actionsFolder = null;
+ 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];
+ }
+ }
+ } else {
+ IVirtualComponent com = ComponentCore.createComponent(ejb);
+ IVirtualFolder ejbRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
+ actionsFolder = (IFolder)ejbRootFolder.getUnderlyingFolder();
+ }
+ return actionsFolder;
+ }
+
+ /**
+ * Returns source roots for first found EJB project.
+ * @return
+ */
+ public IFolder getViewsFolder() {
+ IVirtualComponent com = ComponentCore.createComponent(war);
+ IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
+ return (IFolder)webRootFolder.getUnderlyingFolder();
+ }
+
+ /**
+ * Returns source roots for first found EJB project.
+ * @return
+ */
+ public IFolder getTestsFolder() {
+ IResource testRes = test.findMember("test-src"); //$NON-NLS-1$
+ IFolder testFolder = null;
+ if(testRes instanceof IFolder) {
+ testFolder = (IFolder)testRes;
+ }
+ return testFolder;
+ }
+
+ public String getEntityPackage(){
+ return prefs.get(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "entity"); //$NON-NLS-1$
+ }
+
+ public void refreshLocal(IProgressMonitor monitor) throws CoreException {
+ if(ejb!=null) {
+ ejb.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ }
+ if(test!=null) {
+ test.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ }
+ if(war!=null) {
+ war.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2007-10-16 22:48:11 UTC (rev 4273)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2007-10-16 23:57:46 UTC (rev 4274)
@@ -94,10 +94,16 @@
public Object getDefaultProperty(String propertyName) {
if(JBOSS_AS_HOME.equals(propertyName)) {
return "Jboss_AS_HOME"; //$NON-NLS-1$
- }else if(JBOSS_AS_DEPLOY_AS.equals(propertyName)) {
+ } else if(JBOSS_AS_DEPLOY_AS.equals(propertyName)) {
return "Jboos_DEPLOY_AS"; //$NON-NLS-1$
- }else if (propertyName.equals(FACET_ID)) {
+ } else if (propertyName.equals(FACET_ID)) {
return ISeamCoreConstants.SEAM_CORE_FACET_ID;
+ } else if(SEAM_TEST_PROJECT.equals(propertyName)) {
+ return "";
+ } else if(SEAM_EJB_PROJECT.equals(propertyName)) {
+ return "";
+ } else if(SEAM_EAR_PROJECT.equals(propertyName)) {
+ return "";
}
return super.getDefaultProperty(propertyName);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-10-16 22:48:11 UTC (rev 4273)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-10-16 23:57:46 UTC (rev 4274)
@@ -28,6 +28,7 @@
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeListConverter1;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
+import org.osgi.service.prefs.BackingStoreException;
/**
* @author eskimo
@@ -52,6 +53,11 @@
node.put(SeamFacetPreference.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); //$NON-NLS-1$
node.put(SeamFacetPreference.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); //$NON-NLS-1$
initializeDefault(node,getSeamGenBuildPath());
+ try {
+ node.flush();
+ } catch (BackingStoreException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
}
public static final String SEAM_GEN_HOME = "../../../../jboss-eap/seam"; //$NON-NLS-1$
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/SeamAnnotations.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/SeamAnnotations.java 2007-10-16 22:48:11 UTC (rev 4273)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/SeamAnnotations.java 2007-10-16 23:57:46 UTC (rev 4274)
@@ -19,31 +19,31 @@
*/
public interface SeamAnnotations {
- public static String SEAM_ANNOTATION_TYPE_PREFIX = "org.jboss.seam.annotations."; //$NON-NLS-1$
- public static String NAME_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_NAME"); //$NON-NLS-1$
- public static String SCOPE_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_SCOPE"); //$NON-NLS-1$
- public static String INSTALL_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_INSTALL"); //$NON-NLS-1$
+ public static final String SEAM_ANNOTATION_TYPE_PREFIX = "org.jboss.seam.annotations."; //$NON-NLS-1$
+ public static final String NAME_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_NAME"); //$NON-NLS-1$
+ public static final String SCOPE_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_SCOPE"); //$NON-NLS-1$
+ public static final String INSTALL_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_INSTALL"); //$NON-NLS-1$
- public static String IN_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_IN"); //$NON-NLS-1$
- public static String OUT_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_OUT"); //$NON-NLS-1$
- public static String DATA_MODEL_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + "datamodel.DataModel"; //$NON-NLS-1$
- public static String DATA_MODEL_SELECTION_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + "datamodel.DataModelSelection"; //$NON-NLS-1$
- public static String DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + "datamodel.DataModelSelectionIndex"; //$NON-NLS-1$
+ public static final String IN_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_IN"); //$NON-NLS-1$
+ public static final String OUT_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_OUT"); //$NON-NLS-1$
+ public static final String DATA_MODEL_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + "datamodel.DataModel"; //$NON-NLS-1$
+ public static final String DATA_MODEL_SELECTION_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + "datamodel.DataModelSelection"; //$NON-NLS-1$
+ public static final String DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + "datamodel.DataModelSelectionIndex"; //$NON-NLS-1$
- public static String CREATE_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_CREATE"); //$NON-NLS-1$
- public static String DESTROY_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_DESTROY"); //$NON-NLS-1$
- public static String UNWRAP_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_UNWRAP"); //$NON-NLS-1$
- public static String OBSERVER_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_OBSERVER"); //$NON-NLS-1$
- public static String REMOVE_ANNOTATION_TYPE = "javax.ejb.Remove"; //$NON-NLS-1$
+ public static final String CREATE_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_CREATE"); //$NON-NLS-1$
+ public static final String DESTROY_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_DESTROY"); //$NON-NLS-1$
+ public static final String UNWRAP_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_UNWRAP"); //$NON-NLS-1$
+ public static final String OBSERVER_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_OBSERVER"); //$NON-NLS-1$
+ public static final String REMOVE_ANNOTATION_TYPE = "javax.ejb.Remove"; //$NON-NLS-1$
- public static String FACTORY_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_FACTORY"); //$NON-NLS-1$
+ public static final String FACTORY_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_FACTORY"); //$NON-NLS-1$
- public static String ROLES_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_ROLES"); //$NON-NLS-1$
- public static String ROLE_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_ROLE"); //$NON-NLS-1$
+ public static final String ROLES_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_ROLES"); //$NON-NLS-1$
+ public static final String ROLE_ANNOTATION_TYPE = SEAM_ANNOTATION_TYPE_PREFIX + SeamCoreMessages.getString("SEAM_ANNOTATIONS_ROLE"); //$NON-NLS-1$
- public static String ENTITY_ANNOTATION_TYPE = "javax.persistence.Entity"; //$NON-NLS-1$
- public static String STATEFUL_ANNOTATION_TYPE = "javax.ejb.Stateful"; //$NON-NLS-1$
- public static String STATELESS_ANNOTATION_TYPE = "javax.ejb.Stateless"; //$NON-NLS-1$
- public static String MESSAGE_DRIVEN_ANNOTATION_TYPE = "javax.ejb.MessageDriven"; //$NON-NLS-1$
+ public static final String ENTITY_ANNOTATION_TYPE = "javax.persistence.Entity"; //$NON-NLS-1$
+ public static final String STATEFUL_ANNOTATION_TYPE = "javax.ejb.Stateful"; //$NON-NLS-1$
+ public static final String STATELESS_ANNOTATION_TYPE = "javax.ejb.Stateless"; //$NON-NLS-1$
+ public static final String MESSAGE_DRIVEN_ANNOTATION_TYPE = "javax.ejb.MessageDriven"; //$NON-NLS-1$
}
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4273 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-16 18:48:11 -0400 (Tue, 16 Oct 2007)
New Revision: 4273
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java
Log:
Improved event logs for JSTPublisher ONLY.
JBIDE-1047
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java 2007-10-16 22:48:09 UTC (rev 4272)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java 2007-10-16 22:48:11 UTC (rev 4273)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
@@ -72,6 +73,16 @@
return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
if( type.equals(PublisherEventLogger.FILE_DELETED_EVENT) || type.equals(PublisherEventLogger.FOLDER_DELETED_EVENT))
return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
+ if( type.equals(PublisherEventLogger.PUBLISH_UTIL_STATUS_WRAPPER_TYPE)) {
+ Object data = item.getData();
+ if( data != null && data instanceof IStatus ) {
+ int sev = ((IStatus)data).getSeverity();
+ switch (sev) {
+ case IStatus.ERROR: return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+ case IStatus.WARNING: return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
+ }
+ }
+ }
return null;
}
@@ -106,13 +117,29 @@
if( type.equals(PublisherEventLogger.MODULE_ROOT_EVENT)) {
return getKindDeltaKind(item) + " " + item.getProperty(PublisherEventLogger.MODULE_NAME);
}
+
+ Boolean b = (Boolean)item.getProperty(PublisherEventLogger.SUCCESS_PROPERTY);
+ String fail = "Failed to ";
if( type.equals(PublisherEventLogger.FILE_COPPIED_EVENT)) {
- return "File Copy: " + new Path((String)item.getProperty(PublisherEventLogger.SOURCE_PROPERTY)).lastSegment();
+ return (!b.booleanValue() ? fail : "") +
+ "Copy File: " + new Path((String)item.getProperty(PublisherEventLogger.SOURCE_PROPERTY)).lastSegment();
}
if( type.equals(PublisherEventLogger.FILE_DELETED_EVENT)) {
- return "File Delete: " + new Path((String)item.getProperty(PublisherEventLogger.DEST_PROPERTY)).lastSegment();
+ return (!b.booleanValue() ? fail : "") +
+ "Delete File: " + new Path((String)item.getProperty(PublisherEventLogger.DEST_PROPERTY)).lastSegment();
}
-
+ if( type.equals(PublisherEventLogger.FOLDER_DELETED_EVENT)) {
+ return (!b.booleanValue() ? fail : "") +
+ "Delete Folder: " + new Path((String)item.getProperty(PublisherEventLogger.DEST_PROPERTY)).lastSegment();
+ }
+ if( type.equals(PublisherEventLogger.PUBLISH_UTIL_STATUS_WRAPPER_TYPE)) {
+ Object data = item.getData();
+ if( data != null && data instanceof IStatus ) {
+ IStatus s = (IStatus)data;
+ return s.getMessage();
+ }
+ return data == null ? "null" : data.toString();
+ }
return item.getSpecificType();
}
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4272 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-16 18:48:09 -0400 (Tue, 16 Oct 2007)
New Revision: 4272
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublisherEventLogger.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java
Log:
Improved event logs for JSTPublisher ONLY.
JBIDE-1047
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2007-10-16 21:38:25 UTC (rev 4271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2007-10-16 22:48:09 UTC (rev 4272)
@@ -43,12 +43,15 @@
import org.eclipse.wst.server.core.util.ProjectModule;
import org.eclipse.wst.server.core.util.PublishUtil;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel;
import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogTreeItem;
+import org.jboss.ide.eclipse.as.core.publishers.PublisherEventLogger.DeletedEvent;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.xpl.ModulePackager;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.core.util.FileUtil.IFileUtilListener;
/**
* This class provides a default implementation for packaging different types of
@@ -64,6 +67,7 @@
protected IModuleResourceDelta[] delta;
protected IDeployableServer server;
protected EventLogTreeItem eventRoot;
+ protected int publishState = IServer.PUBLISH_STATE_NONE;
public JstPublisher(IDeployableServer server, EventLogTreeItem context) {
@@ -84,6 +88,7 @@
for( int i = 0; i < module.length; i++ ) {
if( module[i] instanceof DeletedModule )
+ // TODO FIX ME
return null;
}
@@ -102,12 +107,20 @@
IPath deployPath = getDeployPath(moduleTree);
ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor);
IModuleResource[] members = md.members();
- FileUtil.safeDelete(deployPath.toFile());
+ localSafeDelete(deployPath, eventRoot);
+ IStatus[] results = new IStatus[0];
if( !deployPackaged(moduleTree))
- PublishUtil.publishFull(members, deployPath, monitor);
+ results = PublishUtil.publishFull(members, deployPath, monitor);
else
- packModuleIntoJar(moduleTree[moduleTree.length-1], getDeployPath(moduleTree));
+ results = packModuleIntoJar(moduleTree[moduleTree.length-1], getDeployPath(moduleTree));
+ int length = results == null ? 0 : results.length;
+ for( int i = 0; i < length; i++ ) {
+ new PublisherEventLogger.PublishUtilStatusWrapper(eventRoot, results[i]);
+ }
+ if( length != 0 ) EventLogModel.markChanged(eventRoot);
+
+ // adjust timestamps
FileFilter filter = new FileFilter() {
public boolean accept(File pathname) {
if( pathname.getAbsolutePath().toLowerCase().endsWith(".xml"))
@@ -120,21 +133,29 @@
}
protected IStatus incrementalPublish(IModule[] moduleTree, IModule module, IProgressMonitor monitor) throws CoreException {
+ IStatus[] results = new IStatus[] {};
if( !deployPackaged(moduleTree))
- PublishUtil.publishDelta(delta, getDeployPath(moduleTree), monitor);
+ results = PublishUtil.publishDelta(delta, getDeployPath(moduleTree), monitor);
else if( delta.length > 0 )
- packModuleIntoJar(moduleTree[moduleTree.length-1], getDeployPath(moduleTree));
+ results = packModuleIntoJar(moduleTree[moduleTree.length-1], getDeployPath(moduleTree));
- return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
- IStatus.OK, "", null);
+ int length = results == null ? 0 : results.length;
+ for( int i = 0; i < length; i++ ) {
+ new PublisherEventLogger.PublishUtilStatusWrapper(eventRoot, results[i]);
+ }
+ if( length != 0 ) EventLogModel.markChanged(eventRoot);
+
+ return null;
}
protected IStatus unpublish(IDeployableServer jbServer, IModule[] module,
IProgressMonitor monitor) throws CoreException {
- IPath path = getDeployPath(module);
- FileUtil.safeDelete(path.toFile());
- return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
- IStatus.OK, "", null);
+ boolean error = localSafeDelete(getDeployPath(module), eventRoot);
+ if( error ) {
+ publishState = IServer.PUBLISH_STATE_FULL;
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Unable to delete module from server.", new Exception("Some files were not removed from the server")));
+ }
+ return null;
}
protected IPath getDeployPath(IModule[] moduleTree) {
@@ -154,6 +175,34 @@
return root;
}
+ /**
+ *
+ * @param deployPath
+ * @param event
+ * @return returns whether an error was found
+ */
+ protected boolean localSafeDelete(IPath deployPath, final EventLogTreeItem event) {
+ final Boolean[] errorFound = new Boolean[] { new Boolean(false)};
+ IFileUtilListener listener = new IFileUtilListener() {
+ public void fileCoppied(File source, File dest, boolean result,Exception e) {}
+ public void fileDeleted(File file, boolean result, Exception e) {
+ if( result == false || e != null ) {
+ errorFound[0] = new Boolean(true);
+ new DeletedEvent(event, file, result, e);
+ EventLogModel.markChanged(event);
+ }
+ }
+ public void folderDeleted(File file, boolean result, Exception e) {
+ if( result == false || e != null ) {
+ errorFound[0] = new Boolean(true);
+ new DeletedEvent(event, file, result, e);
+ EventLogModel.markChanged(event);
+ }
+ }
+ };
+ FileUtil.safeDelete(deployPath.toFile(), listener);
+ return errorFound[0].booleanValue();
+ }
protected boolean deployPackaged(IModule[] moduleTree) {
if( moduleTree[moduleTree.length-1].getModuleType().getId().equals("jst.utility")) return true;
if( moduleTree[moduleTree.length-1].getModuleType().getId().equals("jst.appclient")) return true;
@@ -161,13 +210,13 @@
}
public int getPublishState() {
- return IServer.PUBLISH_STATE_NONE;
+ return publishState;
}
/*
* Just package into a jar raw. Don't think about it, just do it
*/
- protected void packModuleIntoJar(IModule module, IPath destination)throws CoreException {
+ protected IStatus[] packModuleIntoJar(IModule module, IPath destination)throws CoreException {
String dest = destination.toString();
ModulePackager packager = null;
try {
@@ -187,9 +236,12 @@
packager.finished();
}
catch(IOException e){
- //unhandled
+ IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0,
+ "unable to assemble module", e); //$NON-NLS-1$
+ throw new CoreException(status);
}
}
+ return null;
}
@@ -215,6 +267,4 @@
}
}
}
-
-
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublisherEventLogger.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublisherEventLogger.java 2007-10-16 21:38:25 UTC (rev 4271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublisherEventLogger.java 2007-10-16 22:48:09 UTC (rev 4272)
@@ -2,6 +2,7 @@
import java.io.File;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.server.core.IModule;
import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel;
@@ -100,4 +101,11 @@
}
}
+ public static final String PUBLISH_UTIL_STATUS_WRAPPER_TYPE = "org.jboss.ide.eclipse.as.core.publishers.Events.publishUtilStatusWrapperType";
+ public static class PublishUtilStatusWrapper extends EventLogTreeItem {
+ public PublishUtilStatusWrapper(EventLogTreeItem parent, IStatus status) {
+ super(parent, PUBLISH_MAJOR_TYPE, PUBLISH_UTIL_STATUS_WRAPPER_TYPE);
+ setData(status);
+ }
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2007-10-16 21:38:25 UTC (rev 4271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2007-10-16 22:48:09 UTC (rev 4272)
@@ -118,8 +118,13 @@
publisher = new NullPublisher();
}
publisher.setDelta(getPublishedResourceDelta(module));
- publisher.publishModule(kind, deltaKind, modulePublishState, module, monitor);
- setModulePublishState(module, publisher.getPublishState());
+ try {
+ publisher.publishModule(kind, deltaKind, modulePublishState, module, monitor);
+ } catch( CoreException ce ) {
+ throw ce;
+ } finally {
+ setModulePublishState(module, publisher.getPublishState());
+ }
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java 2007-10-16 21:38:25 UTC (rev 4271)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java 2007-10-16 22:48:09 UTC (rev 4272)
@@ -48,21 +48,26 @@
safeDelete(children[i], listener);
}
}
+
+ if( file.exists()) {
+ try {
+ boolean tmp = file.delete();
+ if( listener != null ) listener.folderDeleted(file, tmp, null);
+ } catch( SecurityException sex) {
+ if( listener != null ) listener.folderDeleted(file, false, sex);
+ }
+ }
+ }
+
+ // files only
+ if( file.exists() ) {
try {
boolean tmp = file.delete();
- if( listener != null ) listener.folderDeleted(file, tmp, null);
+ if( listener != null ) listener.fileDeleted(file, tmp, null);
} catch( SecurityException sex) {
- if( listener != null ) listener.folderDeleted(file, false, sex);
+ if( listener != null ) listener.fileDeleted(file, false, sex);
}
}
-
- // files only
- try {
- boolean tmp = file.delete();
- if( listener != null ) listener.fileDeleted(file, tmp, null);
- } catch( SecurityException sex) {
- if( listener != null ) listener.fileDeleted(file, false, sex);
- }
}
// calls safedelete, but also deletes empty parent folders
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4271 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-16 17:38:25 -0400 (Tue, 16 Oct 2007)
New Revision: 4271
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1099
default initialization is added for PROJECT_NAME to avoid exception during during seam wizard initialization
Bugzilla issue created for WebTools https://bugs.eclipse.org/bugs/show_bug.cgi?id=206541
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2007-10-16 20:17:53 UTC (rev 4270)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2007-10-16 21:38:25 UTC (rev 4271)
@@ -38,6 +38,16 @@
public class SeamFacetProjectCreationDataModelProvider extends WebFacetProjectCreationDataModelProvider {
+ @Override
+ public Object getDefaultProperty(String propertyName) {
+ if(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME.equals(propertyName)) {
+ // Any not empty string should be returned by default
+ // to workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=206541
+ return "dummy";
+ }
+ return super.getDefaultProperty(propertyName);
+ }
+
public static IStatus OK_STATUS = new Status(IStatus.OK, SeamCorePlugin.PLUGIN_ID, 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
public SeamFacetProjectCreationDataModelProvider() {
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4270 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2007-10-16 16:17:53 -0400 (Tue, 16 Oct 2007)
New Revision: 4270
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
removed vpe.mozilla plugins, added new vpe.xulrunner plugin
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2007-10-16 17:41:10 UTC (rev 4269)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2007-10-16 20:17:53 UTC (rev 4270)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.richfaces.feature"
- label="RichFaces VPE Feature"
- version="2.0.0"
- provider-name="JBoss, a division of Red Hat">
-
- <description url="http://www.jboss.org/tools">
- JBossTools RichFaces feature
- </description>
-
- <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.richfaces.feature"
+ label="RichFaces VPE Feature"
+ version="2.0.0"
+ provider-name="JBoss, a division of Red Hat">
+
+ <description url="http://www.jboss.org/tools">
+ JBossTools RichFaces feature
+ </description>
+
+ <copyright>
Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.
Distributed under license by Red Hat, Inc. All rights reserved.
This program is made available under the terms of the
Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
Contributors:
-Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- </copyright>
-
- <license url="http://www.eclipse.org/legal/epl-v10.html">
+Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ </copyright>
+
+ <license url="http://www.eclipse.org/legal/epl-v10.html">
Eclipse Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
@@ -215,237 +215,220 @@
No party to this Agreement will bring a legal action under this
Agreement more than one year after the cause of action arose.
Each party waives its rights to a jury trial in any resulting
-litigation.
- </license>
-
- <plugin
- id="org.jboss.tools.common"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.gef"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.kb"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.model"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.model.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.projecttemplates"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.text.ext"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.text.xml"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.verification"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.verification.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.text.ext"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.text.ext.facelets"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.verification"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.ajax4jsf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.facelets"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.richfaces"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.seam"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.tomahawk"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.jsp"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.server.jetty"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.server.jrun"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.server.resin"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.debug"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.debug.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.tiles"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.tiles.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.verification"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe.mozilla"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe.mozilla.gtk"
- os="linux"
- ws="gtk"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-
- <plugin
- id="org.jboss.tools.vpe.mozilla.win32"
- os="win32"
- ws="win32"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-
- <plugin
- id="org.jboss.tools.vpe.ui.palette"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.firstrun"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
+litigation.
+ </license>
+
+ <plugin
+ id="org.jboss.tools.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.gef"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.kb"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.model"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.model.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.projecttemplates"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.text.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.text.xml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.verification"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.verification.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.text.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.text.ext.facelets"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.verification"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.ajax4jsf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.facelets"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.richfaces"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.seam"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.tomahawk"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.jsp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.server.jetty"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.server.jrun"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.server.resin"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.debug"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.debug.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.tiles"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.tiles.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.verification"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.ui.palette"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.firstrun"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.xulrunner"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4269 - in trunk: jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-10-16 13:41:10 -0400 (Tue, 16 Oct 2007)
New Revision: 4269
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/CheckBoxCellEditorEx.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxCellEditorEx.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1092
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/CheckBoxCellEditorEx.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/CheckBoxCellEditorEx.java 2007-10-16 17:31:53 UTC (rev 4268)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/CheckBoxCellEditorEx.java 2007-10-16 17:41:10 UTC (rev 4269)
@@ -11,12 +11,13 @@
package org.jboss.tools.common.model.ui.attribute.editor;
import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
public class CheckBoxCellEditorEx extends ComboBoxCellEditorEx {
- protected CCombo comboBox;
+ protected Combo comboBox;
protected Composite parent;
protected String trueValue = "true";
@@ -27,7 +28,7 @@
}
protected Control createControl(Composite parent) {
- this.comboBox = (CCombo)super.createControl(parent);
+ this.comboBox = (Combo)super.createControl(parent);
return this.comboBox;
}
protected void doSetValue(Object value) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxCellEditorEx.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxCellEditorEx.java 2007-10-16 17:31:53 UTC (rev 4268)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxCellEditorEx.java 2007-10-16 17:41:10 UTC (rev 4269)
@@ -15,7 +15,6 @@
import org.eclipse.jface.util.Assert;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.KeyAdapter;
@@ -26,6 +25,7 @@
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.TraverseEvent;
import org.eclipse.swt.events.TraverseListener;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -37,7 +37,7 @@
*/
public class ComboBoxCellEditorEx extends CellEditor {
- private CCombo combo;
+ private Combo combo;
private String[] items = new String[0];
private Object value = null;
private int selection;
@@ -75,7 +75,7 @@
}
protected Control createControl(Composite parent) {
- combo = new CCombo(parent, getStyle());
+ combo = new Combo(parent, getStyle());
combo.setItems(items);
combo.setFont(parent.getFont());
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2007-10-16 17:31:53 UTC (rev 4268)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2007-10-16 17:41:10 UTC (rev 4269)
@@ -24,7 +24,6 @@
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.FocusAdapter;
@@ -38,6 +37,7 @@
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@@ -64,7 +64,7 @@
public static int UNLIMITED = -1;
private int textLimit = UNLIMITED;
private int widthInChars = UNLIMITED;
- private CCombo comboField;
+ private Combo comboField;
private String[] tags = new String[0];
// private int style = SWT.NONE;
private static final int defaultStyle = SWT.BORDER;
@@ -91,11 +91,11 @@
createControl(parent);
}
- protected CCombo getComboField() {
+ protected Combo getComboField() {
return comboField;
}
- protected CCombo getComboControl() {
+ protected Combo getComboControl() {
return comboField;
}
@@ -155,7 +155,7 @@
return 2;
}
- protected CCombo getComboControl(Composite parent) {
+ protected Combo getComboControl(Composite parent) {
if (comboField == null) {
int style = getSettings().getStyle("Combo.Style");
Color bg = getSettings().getColor("Combo.Background");
@@ -168,10 +168,10 @@
if (border!=null) {
BorderedControl borderedControl = new BorderedControl(parent, SWT.NONE, border);
- comboField = new CCombo(borderedControl, style);
+ comboField = new Combo(borderedControl, style);
comboField.setBackground(bg);
} else {
- comboField = new CCombo(parent, style);
+ comboField = new Combo(parent, style);
}
comboField.setFont(font);
comboField.setForeground(fg);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java 2007-10-16 17:31:53 UTC (rev 4268)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java 2007-10-16 17:41:10 UTC (rev 4269)
@@ -22,11 +22,11 @@
import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditor;
import org.jboss.tools.common.model.ui.attribute.editor.StringButtonFieldEditorEx;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
@@ -268,7 +268,7 @@
class ComboField {
private Label vklabel;
- private CCombo combo;
+ private Combo combo;
public void createControls(Composite composite) {
vklabel = new Label(composite, SWT.NONE);
@@ -277,7 +277,7 @@
settings.setupControl(vklabel);
BorderedControl border = new BorderedControl(composite, SWT.NONE, settings.getBorder("Combo.Border"));
- combo = new CCombo(border, SWT.FLAT | SWT.READ_ONLY);
+ combo = new Combo(border, SWT.FLAT | SWT.READ_ONLY);
combo.setItems(TAGS);
combo.setText(getSelectedValueKind());
combo.setBackground(settings.getColor("Combo.Background"));
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4268 - trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-16 13:31:53 -0400 (Tue, 16 Oct 2007)
New Revision: 4268
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF
Log:
Update version to 2.1.0 for plugins connected to XulRunner
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF 2007-10-16 17:31:49 UTC (rev 4267)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/META-INF/MANIFEST.MF 2007-10-16 17:31:53 UTC (rev 4268)
@@ -22,5 +22,5 @@
org.jboss.tools.common.model.ui,
org.eclipse.core.resources,
org.eclipse.core.runtime
-Bundle-Version: 2.0.0
+Bundle-Version: 2.1.0
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4267 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-16 13:31:49 -0400 (Tue, 16 Oct 2007)
New Revision: 4267
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
Log:
Update version to 2.1.0 for plugins connected to XulRunner
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2007-10-16 17:31:46 UTC (rev 4266)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2007-10-16 17:31:49 UTC (rev 4267)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Seam VPE support Plug-in
Bundle-SymbolicName: org.jboss.tools.jsf.vpe.seam;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.1.0
Bundle-Localization: plugin
Require-Bundle: org.jboss.tools.vpe
Bundle-Vendor: Red Hat, Inc.
17 years, 3 months
- 1
- 0
JBoss Tools SVN: r4266 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-16 13:31:46 -0400 (Tue, 16 Oct 2007)
New Revision: 4266
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
Log:
Update version to 2.1.0 for plugins connected to XulRunner
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2007-10-16 17:31:41 UTC (rev 4265)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2007-10-16 17:31:46 UTC (rev 4266)
@@ -3,7 +3,7 @@
Bundle-Name: Richfaces VPE Support Plug-in
Bundle-SymbolicName: org.jboss.tools.jsf.vpe.richfaces;singleton:=true
Bundle-Activator: org.jboss.tools.jsf.vpe.richfaces.RichFacesTemplatesActivator
-Bundle-Version: 2.0.0
+Bundle-Version: 2.1.0
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
17 years, 3 months
- 1
- 0