JBoss Tools SVN: r4486 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-24 20:18:23 -0400 (Wed, 24 Oct 2007)
New Revision: 4486
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties
Log:
http://jira.jboss.org/jira/browse/JBIDE-1094
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2007-10-25 00:18:07 UTC (rev 4485)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2007-10-25 00:18:23 UTC (rev 4486)
@@ -7,6 +7,7 @@
public class SeamCoreMessages {
private static final String BUNDLE_NAME = "org.jboss.tools.seam.core.messages"; //$NON-NLS-1$
+
static {
NLS.initializeMessages(BUNDLE_NAME, SeamCoreMessages.class);
}
@@ -37,5 +38,8 @@
public static String ERROR_JBOSS_AS_TARGET_SERVER_INCOMPATIBLE;
public static String ERROR_JBOSS_AS_TARGET_RUNTIME_IS_EMPTY;
public static String ERROR_JBOSS_AS_TARGET_RUNTIME_UNKNOWN;
+ public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED = null;
+ public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW;
+ public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2007-10-25 00:18:07 UTC (rev 4485)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2007-10-25 00:18:23 UTC (rev 4486)
@@ -14,11 +14,14 @@
LIBRARY_SCANNER_CANNOT_PROCESS_JAVA_CLASSES=Cannot process Java Classes
SEAM_VALIDATION_CONTEXT_LINKED_RESOURCE_PATH_MUST_NOT_BE_NULL=Linked resource path must not be null\!
SEAM_VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL=Variable name must not be null\!
+SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW=Check Errors View for details
SEAM_VALIDATION_HELPER_CANNOT_GET_SEAM_PROJECT=Can't get Seam Project
SEAM_CORE_VALIDATOR_ERROR_VALIDATING_SEAM_CORE=Error validating Seam Core
SEAM_VALIDATION_HELPER_RESOURCE_MUST_NOT_BE_NULL=Resource must not be null
SEAM_CORE_VALIDATOR_FACTORY_METHOD_MUST_HAVE_NAME=Factory method must have name: ''{0}''
+SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED=Error occured during creating Seam Web Project
SEAM_EL_VALIDATOR_ERROR_VALIDATING_SEAM_EL=Error validating Seam EL
+SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR=Error
ERROR_JBOSS_AS_TARGET_SERVER_IS_EMPTY=Target Server cannot be empty
ERROR_JBOSS_AS_TARGET_SERVER_UNKNOWN=Unknown Target Server
ERROR_JBOSS_AS_TARGET_SERVER_NO_SERVERS_DEFINED=There are no available Target Service for selected Target Runtime
18 years, 2 months
JBoss Tools SVN: r4485 - 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-24 20:18:07 -0400 (Wed, 24 Oct 2007)
New Revision: 4485
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1094
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-10-24 23:58:21 UTC (rev 4484)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-10-25 00:18:07 UTC (rev 4485)
@@ -66,7 +66,7 @@
import org.osgi.service.prefs.BackingStoreException;
// TODO: why not just *one* global filter set to avoid any missing names ? (assert for it in our unittests!
-public class Seam2FacetInstallDelegate extends Object implements IDelegate,ISeamFacetDataModelProperties {
+public class Seam2FacetInstallDelegate extends SeamFacetAbstractInstallDelegate{
public static String DEV_WAR_PROFILE = "dev-war"; //$NON-NLS-1$
public static String DEV_EAR_PROFILE = "dev"; //$NON-NLS-1$
@@ -194,7 +194,7 @@
public static String WEB_LIBRARIES_RELATED_PATH = "WEB-INF/lib"; //$NON-NLS-1$
- public void execute(final IProject project, IProjectFacetVersion fv,
+ public void doExecute(final IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
final IDataModel model = (IDataModel)config;
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2007-10-25 00:18:07 UTC (rev 4485)
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * 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.internal.core.project.facet;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.ILogListener;
+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.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.common.project.facet.core.IDelegate;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.jboss.tools.seam.core.SeamCoreMessages;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+
+/**
+ *
+ * @author eskimo
+ *
+ */
+public abstract class SeamFacetAbstractInstallDelegate implements ILogListener,
+ IDelegate,ISeamFacetDataModelProperties {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.common.project.facet.core.IDelegate#execute(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public void execute(IProject project, IProjectFacetVersion fv,
+ Object config, IProgressMonitor monitor) throws CoreException {
+ try {
+ // TODO find a better way to handle exceptions for creating seam projects
+ // now here is the simple way that allows keep most of seam classes
+ // untouched, this abstract class just listen to eclipse log and show an
+ // error dialog if there were records logged from seam.core plugin
+ startListening();
+ doExecute(project,fv,config,monitor);
+ } finally {
+ stopListening();
+ }
+ if(errorOccurs) {
+ Display.getDefault().syncExec(
+ new Runnable() {
+ public void run() {
+ ErrorDialog.openError(Display.getCurrent().getActiveShell(),
+ SeamCoreMessages.SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR,
+ SeamCoreMessages.SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW,
+ new Status(IStatus.ERROR,SeamCorePlugin.PLUGIN_ID,
+ SeamCoreMessages.SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED));
+ }
+ });
+ }
+ }
+
+ /**
+ *
+ * @param project
+ * @param fv
+ * @param config
+ * @param monitor
+ * @throws CoreException
+ */
+ protected abstract void doExecute(IProject project, IProjectFacetVersion fv,
+ Object config, IProgressMonitor monitor) throws CoreException;
+
+
+ /**
+ *
+ */
+ private void stopListening() {
+ SeamCorePlugin.getDefault().getLog().removeLogListener(this);
+ }
+
+ /**
+ *
+ */
+ private void startListening() {
+ SeamCorePlugin.getDefault().getLog().addLogListener(this);
+ }
+
+ private boolean errorOccurs = false;
+
+ private boolean hasErrors() {
+ return errorOccurs;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.common.project.facet.core.IActionConfigFactory#create()
+ */
+ public Object create() throws CoreException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void logging(IStatus status, String plugin) {
+ if(status.getPlugin().equals(SeamCorePlugin.PLUGIN_ID)) {
+ errorOccurs = true;
+ }
+ }
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-10-24 23:58:21 UTC (rev 4484)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-10-25 00:18:07 UTC (rev 4485)
@@ -61,7 +61,7 @@
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.osgi.service.prefs.BackingStoreException;
-public class SeamFacetInstallDelegate extends Object implements IDelegate,ISeamFacetDataModelProperties {
+public class SeamFacetInstallDelegate extends SeamFacetAbstractInstallDelegate {
public static String DEV_WAR_PROFILE = "dev-war"; //$NON-NLS-1$
public static String DEV_EAR_PROFILE = "dev"; //$NON-NLS-1$
@@ -188,7 +188,7 @@
public static String WEB_LIBRARIES_RELATED_PATH = "WEB-INF/lib"; //$NON-NLS-1$
- public void execute(final IProject project, IProjectFacetVersion fv,
+ public void doExecute(final IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
final IDataModel model = (IDataModel)config;
@@ -662,12 +662,4 @@
SeamCorePlugin.getPluginLog().logError(e);
}
}
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.project.facet.core.IActionConfigFactory#create()
- */
- public Object create() throws CoreException {
- // TODO Auto-generated method stub
- return null;
- }
}
18 years, 2 months
JBoss Tools SVN: r4484 - 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-24 19:58:21 -0400 (Wed, 24 Oct 2007)
New Revision: 4484
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/SeamBaseWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1157
surplus fields were removed and auto completion was restored
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-24 21:33:42 UTC (rev 4483)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2007-10-24 23:58:21 UTC (rev 4484)
@@ -88,10 +88,6 @@
loadCustomVariables(vars);
-// String actionFolder = vars.get(ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME).toString();
-// String entityFolder = vars.get(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME).toString();
-// String testFolder = vars.get(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME).toString();
-
String actionFolder = getSessionBeanPackageName(seamFacetPrefs, params);
String entityFolder = getEntityBeanPackageName(seamFacetPrefs, params);
String testFolder = getTestCasesPackageName(seamFacetPrefs, params);
@@ -124,7 +120,7 @@
FileUtils.getFileUtils().copyFile(new File(mapping[0]), file[index],filters,true);
index++;
}
- seamPrjSet.refreshLocal(monitor);
+
Display.getCurrent().asyncExec(new Runnable() {
/* (non-Javadoc)
* @see java.lang.Runnable#run()
@@ -140,13 +136,21 @@
}
}
});
- } catch (CoreException e) {
- result = new Status(IStatus.ERROR,SeamGuiPlugin.PLUGIN_ID,e.getMessage(),e);
+
} catch (BackingStoreException e) {
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);
- }
+ } finally {
+ try {
+ seamPrjSet.refreshLocal(monitor);
+ } catch (CoreException e) {
+ result = new Status(IStatus.ERROR,SeamGuiPlugin.PLUGIN_ID,e.getMessage(),e);
+ }
+ }
+ if (result.getSeverity()==IStatus.ERROR) {
+ SeamGuiPlugin.getDefault().getLog().log(result);
+ }
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-24 21:33:42 UTC (rev 4483)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-10-24 23:58:21 UTC (rev 4484)
@@ -12,6 +12,7 @@
package org.jboss.tools.seam.ui.wizard;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.IOperationHistory;
@@ -77,9 +78,10 @@
} catch (ExecutionException e) {
result = new Status(IStatus.ERROR,SeamGuiPlugin.PLUGIN_ID,e.getMessage(),e);
SeamCorePlugin.getPluginLog().logError(e);
- ErrorDialog.openError(Display.getCurrent().getActiveShell(), "Seam wizard error", result.getMessage(), result);
}
- //ErrorDialog.openError(Display.getCurrent().getActiveShell(), SeamUIMessages.SeamBaseWizard_0, result.getMessage(), result);
+ if(result.getSeverity()==IStatus.ERROR) {
+ ErrorDialog.openError(Display.getCurrent().getActiveShell(), "Error", MessageFormat.format("Error occur during creating {0}. Please, check Error Log View for details." , SeamBaseWizard.this.getWindowTitle()),result);
+ }
}
});
} catch (InvocationTargetException e) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-10-24 21:33:42 UTC (rev 4483)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-10-24 23:58:21 UTC (rev 4484)
@@ -112,9 +112,8 @@
if(selectdProject!=null && !"".equals(selectdProject) && isValidProjectSelected()) {
isValidRuntimeConfigured(getSelectedProject());
- } else {
- setPageComplete(false);
}
+ setPageComplete(false);
}
/* (non-Javadoc)
@@ -313,12 +312,17 @@
if(errors.size()>0) {
setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
setPageComplete(false);
- getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false);
+ IFieldEditor beanEditor = getEditor(IParameter.SEAM_BEAN_NAME);
+ if(beanEditor!=null) {
+ beanEditor.setEnabled(false);
+ }
IFieldEditor packageEditor = getEditor(IParameter.SEAM_PACKAGE_NAME);
if(packageEditor!=null) {
packageEditor.setEnabled(false);
}
return false;
+ } else {
+
}
return true;
}
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-24 21:33:42 UTC (rev 4483)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2007-10-24 23:58:21 UTC (rev 4484)
@@ -45,9 +45,10 @@
*/
@Override
protected void createEditors() {
- super.createEditors();
-
+ addEditor(SeamWizardFactory.createSeamProjectSelectionFieldEditor(SeamWizardUtils.getRootSeamProjectName(initialSelection)));
addEditor(SeamWizardFactory.createSeamEntityClasNameFieldEditor());
+ String packageName = getDefaultPackageName(SeamWizardUtils.getRootSeamProjectName(initialSelection));
+ addEditor(SeamWizardFactory.createSeamJavaPackageSelectionFieldEditor(packageName));
addEditor(SeamWizardFactory.createSeamMasterPageNameFieldEditor());
addEditor(SeamWizardFactory.createSeamPageNameFieldEditor());
}
@@ -97,15 +98,6 @@
protected void doValidate(PropertyChangeEvent event) {
if(!isValidProjectSelected()) return;
- Map errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(
- editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue(), null);
-
- if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
- setPageComplete(false);
- return;
- }
- getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(true);
IFieldEditor packageEditor = getEditor(IParameter.SEAM_PACKAGE_NAME);
if(packageEditor!=null) {
packageEditor.setEnabled(true);
@@ -115,7 +107,7 @@
if(!isValidRuntimeConfigured(project)) return;
- errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(
+ Map errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(
editorRegistry.get(IParameter.SEAM_ENTITY_CLASS_NAME).getValue(), null);
if(errors.size()>0) {
18 years, 2 months
JBoss Tools SVN: r4483 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-24 17:33:42 -0400 (Wed, 24 Oct 2007)
New Revision: 4483
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/SingleFilePublisher.java
Log:
JBIDE-1140 - switched removal error to warning
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-24 21:29:39 UTC (rev 4482)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2007-10-24 21:33:42 UTC (rev 4483)
@@ -170,7 +170,7 @@
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. (" + getModulePath(module) + ")", new Exception("Some files were not removed from the server")));
+ throw new CoreException(new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, "Unable to delete module from server. (" + getModulePath(module) + ")", new Exception("Some files were not removed from the server")));
}
return null;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2007-10-24 21:29:39 UTC (rev 4482)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2007-10-24 21:33:42 UTC (rev 4483)
@@ -93,7 +93,7 @@
FileUtil.safeDelete(destFolder.append(sourcePath.lastSegment()).toFile(), l);
if( l.errorFound ) {
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")));
+ throw new CoreException(new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, "Unable to delete module from server.", new Exception("Some files were not removed from the server")));
}
}
18 years, 2 months
JBoss Tools SVN: r4482 - trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-24 17:29:39 -0400 (Wed, 24 Oct 2007)
New Revision: 4482
Added:
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/AllTests.java
Log:
Test suite classes were renamed
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/AllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/AllTests.java 2007-10-24 21:29:06 UTC (rev 4481)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/AllTests.java 2007-10-24 21:29:39 UTC (rev 4482)
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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
- ******************************************************************************/
-package org.jboss.tools.vpe.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Class created for run tests for org.jboss.tools.vpe plugin.
- *
- * @author Max Areshkau
- *
- */
-
-public class AllTests extends TestCase{
-
- public static Test suite(){
- TestSuite suite = new TestSuite("Tests for vpe");
- // $JUnit-BEGIN$
- suite.addTestSuite(TemplateLoadingTest.class);
- suite.addTestSuite(TemplatesExpressionParsingTest.class);
- // $JUnit-END$
- return suite;
- }
-}
Copied: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java (from rev 4455, trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/AllTests.java)
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2007-10-24 21:29:39 UTC (rev 4482)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * 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
+ ******************************************************************************/
+package org.jboss.tools.vpe.test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Class created for run tests for org.jboss.tools.vpe plugin.
+ *
+ * @author Max Areshkau
+ *
+ */
+
+public class VpeAllTests extends TestCase{
+
+ public static Test suite(){
+ TestSuite suite = new TestSuite("Tests for vpe");
+ // $JUnit-BEGIN$
+ suite.addTestSuite(TemplateLoadingTest.class);
+ suite.addTestSuite(TemplatesExpressionParsingTest.class);
+ // $JUnit-END$
+ return suite;
+ }
+}
18 years, 2 months
JBoss Tools SVN: r4481 - trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-24 17:29:06 -0400 (Wed, 24 Oct 2007)
New Revision: 4481
Added:
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/AllTests.java
Log:
Test suite classes were renamed
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/AllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/AllTests.java 2007-10-24 21:19:21 UTC (rev 4480)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/AllTests.java 2007-10-24 21:29:06 UTC (rev 4481)
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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
- ******************************************************************************/
-package org.jboss.tools.vpe.xulrunner.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for " + AllTests.class.getName());
- //add test cases for dom elements
- suite.addTestSuite(DOMCreatingTest.class);
- return suite;
- }
-
-}
Copied: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java (from rev 4455, trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/AllTests.java)
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2007-10-24 21:29:06 UTC (rev 4481)
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * 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
+ ******************************************************************************/
+package org.jboss.tools.vpe.xulrunner.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class XulRunnerAllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for " + XulRunnerAllTests.class.getName());
+ //add test cases for dom elements
+ suite.addTestSuite(DOMCreatingTest.class);
+ return suite;
+ }
+
+}
18 years, 2 months
JBoss Tools SVN: r4480 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-24 17:19:21 -0400 (Wed, 24 Oct 2007)
New Revision: 4480
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1154
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2007-10-24 20:48:40 UTC (rev 4479)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2007-10-24 21:19:21 UTC (rev 4480)
@@ -27,7 +27,7 @@
textSet.put(new Character('&'),"&");
textSet.put(new Character('<'),"<");
textSet.put(new Character('>'),">");
- textSet.put(new Character(' ')," ");
+// textSet.put(new Character(' ')," ");
textSet.put(new Character('\u00A1'),"¡");
textSet.put(new Character('\u00A2'),"¢");
textSet.put(new Character('\u00A3'),"£");
18 years, 2 months
JBoss Tools SVN: r4479 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-24 16:48:40 -0400 (Wed, 24 Oct 2007)
New Revision: 4479
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesModelModuleContributor.java
Log:
JBIDE-827 add / remove showing duplicate archive entries
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesModelModuleContributor.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesModelModuleContributor.java 2007-10-24 20:41:20 UTC (rev 4478)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesModelModuleContributor.java 2007-10-24 20:48:40 UTC (rev 4479)
@@ -104,6 +104,10 @@
}
public void refreshProject(IPath projectLoc) {
+ // prime, make sure all are found
+ if( modules == null )
+ getModules();
+
// remove old mods
ArrayList<IModule> mods = projectToModules.get(projectLoc);
IModule mod;
@@ -115,6 +119,7 @@
arc = ((PackagedModuleDelegate)moduleDelegates.get(mod)).getPackage();
packageToModule.remove(arc);
moduleDelegates.remove(mod);
+ modules.remove(mod);
}
}
}
18 years, 2 months
JBoss Tools SVN: r4478 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-24 16:41:20 -0400 (Wed, 24 Oct 2007)
New Revision: 4478
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java
Log:
fix error in JUnit tests
Unable to create perspective 'org.jboss.tools.jst.web.ui.RedHat4WebPerspective'. There is no corresponding perspective extension.
perspective ID updated
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java 2007-10-24 19:29:00 UTC (rev 4477)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/WebDevelopmentPerspectiveFactory.java 2007-10-24 20:41:20 UTC (rev 4478)
@@ -21,7 +21,7 @@
*/
public class WebDevelopmentPerspectiveFactory implements IPerspectiveFactory {
- public static final String PERSPECTIVE_ID = "org.jboss.tools.jst.web.ui.RedHat4WebPerspective";
+ public static final String PERSPECTIVE_ID = "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective";
/* (non-Javadoc)
* @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
18 years, 2 months
JBoss Tools SVN: r4477 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui: views and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-24 15:29:00 -0400 (Wed, 24 Oct 2007)
New Revision: 4477
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java
Log:
JBIDE-1163 - closed projects no longer show
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2007-10-24 19:02:17 UTC (rev 4476)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2007-10-24 19:29:00 UTC (rev 4477)
@@ -1,4 +1,4 @@
-ProjectPackagesView_noProjectSelectedMessage=Please select a project or resource
+ProjectPackagesView_noProjectSelectedMessage=Please select an opened project or resource.
ProjectPackagesView_noPackagesDefinedMessage=No archives have been defined for the project "{0}".
ProjectPackagesView_createPackagesMessage=Project has no defined archives. Create an Archive:
ProjectPackagesView_newPackageMenu_label=New Archive
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java 2007-10-24 19:02:17 UTC (rev 4476)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesView.java 2007-10-24 19:29:00 UTC (rev 4477)
@@ -227,7 +227,9 @@
return;
}
- if( ArchivesModelCore.packageFileExists(project.getLocation()) ) {
+ if( !project.isAccessible() ) {
+ book.showPage(noSelectionComposite);
+ } else if( ArchivesModelCore.packageFileExists(project.getLocation()) ) {
if( ArchivesModelCore.projectRegistered(project.getLocation()))
book.showPage(viewerComposite);
else {
@@ -273,7 +275,7 @@
IProject[] projects2 = ResourcesPlugin.getWorkspace().getRoot().getProjects();
ArrayList list = new ArrayList();
for( int i = 0; i < projects2.length; i++ ) {
- if( ArchivesModelCore.packageFileExists(projects2[i].getLocation())) {
+ if( projects2[i].isAccessible() && ArchivesModelCore.packageFileExists(projects2[i].getLocation())) {
list.add(projects2[i]);
}
}
18 years, 2 months